Merge "wallpaper: fix null service manager registered to server" into udc-dev...

Merge "wallpaper: fix null service manager registered to server" into udc-dev am: ff9f7271 am: 818e63be

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



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