Merge "DO NOT MERGE Prevent ImageWallpaper from keeping crashing" into oc-dev am: c34919e166

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

Change-Id: I2aa74fd4e158b2f76aed3559c9bb28458fabc7ef