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

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

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



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