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

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



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