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: 04f17655 am: dc8e93f1

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

Change-Id: I9939b5bfcf83c747a9a5cdf7f0b386006b7c4c0d