Merge "Fixed an issue where the heads up were not rounded during bypass" into...

Merge "Fixed an issue where the heads up were not rounded during bypass" into sc-dev am: a2c2bfde am: 0d57b0bb

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

Change-Id: Ibe02e7efe3fce88a1e95b3060c12b37c4e08a80b