[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 skip reason: subject contains skip directive

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

Change-Id: Iae1f2bb3f99611144a6fbf39347c247617e8e769