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: I5cca1fe905d026d8e58d8db09ea4dd6bdd4bb298
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>