Merge "Fix the gold highlight encircles the app badge in the bubble." into rvc-dev am: b0bc7497 am: ca6bf47a am: 61f150d6

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

Change-Id: I475ebd93191ee90c27051735629bd4229e4f332d