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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I423411434ac4891d8452e101fd9e295aa5bcbd6a