Merge "Fix IWallpaperEngineWrapper NPE in wearOS" into udc-dev am: c9285e0921

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

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