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

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

Change-Id: Ia643f86e571ace8329306ad95e864073b5b50d76