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

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



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