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

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

Change-Id: Ibe02e7efe3fce88a1e95b3060c12b37c4e08a80b

packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java

@@ -367,6 +367,7 @@ public class NotificationShelf extends ActivatableNotificationView implements
                 && !mHostLayoutController.isViewAffectedBySwipe(anv)
                 && !isUnlockedHeadsUp
                 && !isHunGoingToShade
+                && !anv.isAboveShelf()
                 && !mAmbientState.isPulsing()
                 && !mAmbientState.isDozing();