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: d8db90ff

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



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