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

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



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