[automerger skipped] DO NOT MERGE Prevent ImageWallpaper from keeping crashing am: a3bff94e18 am: 7c459fe322 am: 76288ca6b5 -s ours am: 533889905c -s ours am: 9ce91e0d10

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

Change-Id: I3c4f3f4ca77741e768843432ff3abd3e54d9c4d7