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

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

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