[automerger skipped] Merge "DO NOT MERGE Prevent ImageWallpaper from keeping crashing" into oc-dev am: c34919e166 am: 804d42f1ef am: 172a0954c5 -s ours am: b8e311740b -s ours am: 95c4e942dc am: 170465e0a2 -s ours am: 27c4aef372 am: 9948425ec5 am: 7c6e032fc6

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

Change-Id: I6b3ee676f19e8098328e676306455dde50c010a2