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: c6bc7086 am: b99cfc7f

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

Change-Id: Idafcad53a37aed11ee21d8dcdb199f1d18256d42