Merge "Fix the gold highlight encircles the app badge in the bubble." into rvc-dev am: c6bc7086

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

Change-Id: I2b073b9ed5af049633c76e0f803821812d13df7f