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

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



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