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

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

Change-Id: Icb86fecfab8305f19eb45a5753b04646e5d6b4b7