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

[automerger skipped] Merge "DO NOT MERGE Prevent ImageWallpaper from crashing due to wide gamut" into qt-dev am: 04ee91a8 am: dd974dc8 -s ours am: 17416bcf am: 016184b9 am: 6ab8bd7b

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

Change-Id: I0ad2930ce0a33b524b196a872ccb9613c8cf6505