Merge "Catch an exception when loading a bubble icon" into udc-qpr-dev am:...

Merge "Catch an exception when loading a bubble icon" into udc-qpr-dev am: edf51230 am: 00b4c341

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



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