[automerger skipped] DO NOT MERGE Prevent ImageWallpaper from keeping crashing am: a3bff94e18 am: 7c459fe322 am: 76288ca6b5 -s ours am: 533889905c -s ours am: 9ce91e0d10 am: 66fb771101 -s ours am: 76575281db am: 0181f79d00 am: a83f23c61e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11700786 Change-Id: I4d86ac0796863410f480a8308dc2fbecfeda6a2a
This commit is contained in: