Merge "Optimizing some icon generation code in bubble" into tm-qpr-dev am: ac622814

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



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