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

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

Change-Id: I0c984f6a9d3a304f11f66b87e4b0e5885cd0e173