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

Merge "Guard against failed bitmap conversions" into udc-dev am: 4c45ee8c am: 65aa8b07 am: 38d7f4e4 am: 74bd2925

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



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