[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 am: 170465e0 -s ours am: 27c4aef3 am: 9948425e am: 56e2b96e am: 7467df38 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I0005fbe02e38ece3a6a17673424528f1718c9bd8