Merge "Broaden exception criteria for failed image URI resolution" am: aeccfd0ef5 am: 7e3123b524

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Bluetooth/+/1573373

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2f385a184f695d5487dc2e0b5be15cc4ab19ff37