Merge "Fix handling of bad image previews." am: 9e388035c9

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

Change-Id: I56d8c73381d357b76928519b2d50f56e7ba3a931