Merge "Fixes improbable NPE in WallpaperManagerService dump()" into udc-dev am: 9e5276fab3

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22162905

Change-Id: Ic4480b26738df421cd227c3867742942bc851815
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

services/core/java/com/android/server/wallpaper/WallpaperManagerService.java

@@ -3560,6 +3560,9 @@ public class WallpaperManagerService extends IWallpaperManager.Stub
     }
 
     private void dumpWallpaper(WallpaperData wallpaper, PrintWriter pw) {
+        if (wallpaper == null) {
+            pw.println(" (null entry)");
+        }
         pw.print(" User "); pw.print(wallpaper.userId);
         pw.print(": id="); pw.print(wallpaper.wallpaperId);
         pw.print(": mWhich="); pw.print(wallpaper.mWhich);