[automerger skipped] Merge "Catch all exceptions when loading images" into...

[automerger skipped] Merge "Catch all exceptions when loading images" into main am: 228ccb46 am: 4b0388e4 -s ours

am skip reason: Merged-In Ibbcb24184be844b8549974a62496d16db15fadee with SHA-1 94d4952a is already in history

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



Change-Id: Ic8717cb70492eab8391c33dc0487008f09df5fac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>