Merge "Fix handling of bad image previews." into rvc-qpr-dev am: a102616d48

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

Change-Id: Id4d3c2c864c512e4d57d6552b0b357a2f3c60cf0