Merge "WallpaperManagerService:fix NPE happen in onDisplayReadyInternal method ." into main am: 7e24581cd9 am: 96a71a86f4

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

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