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

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

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



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