Merge "Merge "Guard against failed bitmap conversions" into udc-dev am:...

Merge "Merge "Guard against failed bitmap conversions" into udc-dev am: 4c45ee8c am: 65aa8b07" into udc-d1-dev-plus-aosp am: 39bcb529

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



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