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: cb75bd87 am: b50e81f9 am: c9a2afdc

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

Change-Id: I4a6eb70abe4e63ea1af39435c04478aceb982b8a