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 am: fb815518

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



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