Merge "Move shade underneath light reveal scrim" into main

        sysui:ignoreRightInset="true"

    />

    <com.android.systemui.statusbar.LightRevealScrim

        android:id="@+id/light_reveal_scrim"

    <include layout="@layout/status_bar_expanded"

             android:layout_width="match_parent"

             android:layout_height="match_parent"

        sysui:ignoreRightInset="true" />

             android:visibility="invisible" />

    <include layout="@layout/status_bar_expanded"

    <com.android.systemui.statusbar.LightRevealScrim

        android:id="@+id/light_reveal_scrim"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

             android:visibility="invisible" />

        sysui:ignoreRightInset="true" />

    <!-- Root for all keyguard content. It was previously located within the shade. -->

    <com.android.systemui.keyguard.ui.view.KeyguardRootView