Merge "Merge "Fix the gold highlight encircles the app badge in the bubble."...

Merge "Merge "Fix the gold highlight encircles the app badge in the bubble." into rvc-dev am: b0bc7497 am: 19151c4e am: 0a1df84b" into rvc-qpr-dev-plus-aosp am: 2d2b2ea6

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

Change-Id: I0f79f91f16f42e5ed606813d69b85ac6a2e5e531