[automerger skipped] Merge "Fix handling of bad image previews." am:...

[automerger skipped] Merge "Fix handling of bad image previews." am: 9e388035 am: 737107bb am: dcd9e4e8 -s ours am: 2b042ed4 -s ours

am skip reason: Change-Id I49190c1fbc4e25b3d2e2802a90de355bff297f7e with SHA-1 208b157b is in history

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

Change-Id: Ied821a19f0ded521de3d3bf8e5ca25fc1b42221f