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

Merge "Fix the gold highlight encircles the app badge in the bubble." into rvc-dev am: b0bc7497 am: 19151c4e am: a75716c4

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

Change-Id: Ifdda358b7cf357c7aacacfb5b51ab6d552079a3d