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

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

Change-Id: I06c8fabb001e24850df44e93fc14af1f480b0355