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: I4c0b7b2be23755daddd9f2e6594f695e2d9a1df4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>