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

[automerger skipped] DO NOT MERGE Prevent ImageWallpaper from keeping crashing am: a3bff94e am: 7c459fe3 am: 76288ca6 -s ours am: 53388990 -s ours am: 9ce91e0d am: 66fb7711 -s ours am: 76575281 am: 0181f79d am: a83f23c6

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

Change-Id: I4d86ac0796863410f480a8308dc2fbecfeda6a2a