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

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



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