Merge "Merge "Fix clipping of an app badge on bubbles in overflow" into...

Merge "Merge "Fix clipping of an app badge on bubbles in overflow" into tm-qpr-dev am: a6e03b00" into tm-qpr-dev-plus-aosp am: c27b541c

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



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