Merge "Ensure that bubble badge is always circle" into rvc-qpr-dev am: 441d5a3cd5 am: ad34b1110e

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

Change-Id: I72288d0e7735903d5dd31f4966aa61e17bc5d04d