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

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



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