Merge "Fix WallpaperManagerInternal NPE" into udc-dev am: 8977208b am: ec0bc133 am: f61b29ac

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



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