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

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



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