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