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