Merge "Use bitmap width for bubble icon and app badge to calculate...

Merge "Use bitmap width for bubble icon and app badge to calculate translation" into tm-dev am: eadf6886

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



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