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

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



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