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

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

Change-Id: I202699d551709473b18621ee7cb0af2731dfb704