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

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

Change-Id: I3010157a1b644d2fb68b015de7283c6c83033a54