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: ca6bf47a am: 61f150d6 am: f438a8ee

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

Change-Id: I93034d20f6e4bcb43d4cdafc0e58af72b723902f