Merge "Move notification scrim behind clock" into sc-dev am: 68897d1291

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

Change-Id: Iaf7c1019871fc859ff1d02a642f3c183c9412ed9

packages/SystemUI/res/layout/status_bar_expanded.xml

@@ -64,10 +64,6 @@
         android:clipToPadding="false"
         android:clipChildren="false">
 
-        <include
-            layout="@layout/keyguard_status_view"
-            android:visibility="gone"/>
-
         <com.android.systemui.scrim.ScrimView
             android:id="@+id/scrim_notifications"
             android:layout_width="0dp"
@@ -78,7 +74,11 @@
             systemui:layout_constraintEnd_toEndOf="parent"
             systemui:layout_constraintTop_toTopOf="parent"
             systemui:layout_constraintBottom_toBottomOf="parent"
-            />
+        />
+
+        <include
+            layout="@layout/keyguard_status_view"
+            android:visibility="gone"/>
 
         <include layout="@layout/dock_info_overlay" />