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 am: f79c2108 am: 3d3e0802

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



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