Fix AppBarLayout statusBarForeground issue where status bar drawable is drawn behind content

Resolves #824

PiperOrigin-RevId: 285981837
(cherry picked from commit 2059499)

Author: dsn5ft

lib/java/com/google/android/material/appbar/AppBarLayout.java

@@ -333,6 +333,7 @@ public void setStatusBarForeground(@Nullable Drawable drawable) {
         statusBarForeground.setVisible(getVisibility() == VISIBLE, false);
         statusBarForeground.setCallback(this);
       }
+      updateWillNotDraw();
       ViewCompat.postInvalidateOnAnimation(this);
     }
   }
@@ -379,7 +380,7 @@ public void draw(@NonNull Canvas canvas) {
     super.draw(canvas);
 
     // Draw the status bar foreground drawable if we have a top inset
-    if (statusBarForeground != null && getTopInset() > 0) {
+    if (shouldDrawStatusBarForeground()) {
       int saveCount = canvas.save();
       canvas.translate(0f, -currentOffset);
       statusBarForeground.draw(canvas);
@@ -480,6 +481,14 @@ protected void onLayout(boolean changed, int l, int t, int r, int b) {
     }
   }
 
+  private void updateWillNotDraw() {
+    setWillNotDraw(!shouldDrawStatusBarForeground());
+  }
+
+  private boolean shouldDrawStatusBarForeground() {
+    return statusBarForeground != null && getTopInset() > 0;
+  }
+
   private boolean hasCollapsibleChild() {
     for (int i = 0, z = getChildCount(); i < z; i++) {
       if (((LayoutParams) getChildAt(i).getLayoutParams()).isCollapsible()) {
@@ -981,6 +990,7 @@ WindowInsetsCompat onWindowInsetChanged(final WindowInsetsCompat insets) {
     // If our insets have changed, keep them and trigger a layout...
     if (!ObjectsCompat.equals(lastInsets, newInsets)) {
       lastInsets = newInsets;
+      updateWillNotDraw();
       requestLayout();
     }