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

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

Change-Id: I69a1cf3caae39737750dd98523869f27e9f8be08