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

Merge "Revert "Fix the gold highlight encircles the app badge in the bubble."" into rvc-dev am: ccd2d93c am: afe3467a am: 5756d04c

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

Change-Id: I4315bc701067206e2c43ab5e7e7e0d3dbdbe4337