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: I613ee28c935e58a8a4f45cdcd3caa78baff33959