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 am: 3cff4180

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

Change-Id: Ie81d99f1f20fc1c589f4816bb303d46ebeab8e2c