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

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

Change-Id: I0a7ff28f955ce655acb96cb63f7ec170da082005