Merge "Guard against failed bitmap conversions" into udc-dev am: 4c45ee8c am: 65aa8b07

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



Change-Id: Ibba6c437ad52ba34704ecc4a2ae2e7a4ef60e1b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>