Merge "Throw IOE from within resolveImage rather than NPE." into rvc-dev am: 36060929b4 am: 03fd9a8a15 am: 9dfd51d97c

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

Change-Id: I78e54b4d3ac9f1becf605cd316882ddf34165c1f