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

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

Change-Id: I8950235acdae7e763c79d332078a4a257da475e2