[automerger skipped] Merge "DO NOT MERGE Prevent ImageWallpaper from keeping...

[automerger skipped] Merge "DO NOT MERGE Prevent ImageWallpaper from keeping crashing" into oc-dev am: c34919e1 am: 804d42f1 am: 172a0954 -s ours am: b8e31174 -s ours am: 95c4e942

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

Change-Id: I8a582f063df45d5a0d654a7c94571a2f9d892a30