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

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



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