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

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

Change-Id: I9c1eeb26a1cd8bd3b881f01f48fd10734b028a7e