[automerger skipped] Merge "Fix getWallpaperSafeLocked" into udc-qpr-dev am: 417b153e4f am: 146583ef06 -s ours

am skip reason: Merged-In Ib37f83233deac7198997910991ffcce75b357aae with SHA-1 ec29cb2287 is already in history

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

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