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

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

Change-Id: Id78c50d6288303c7091dbf1f09fa919be37ea58e