Merge "Fix aliasing issue with bubble badge bitmap" into rvc-qpr-dev am: 4c1d6159

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

Change-Id: I31f8c8bfa5e6cc815a0935038a73e1b0f572579c