Merge "Fix exception caused by system app setting wallpaper" am: aa33e703...

Merge "Fix exception caused by system app setting wallpaper" am: aa33e703 am: 2b40eb94 am: 62f11f57

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



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