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: Idc77fc97b276b2c29e72e153a9ee9ed5fef64f4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>