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

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

Change-Id: I01089fe6006c94208191efec9833ea8d42d39769