[Spa] Fix edge to edge when target SDK 35

Use WindowInsets.safeDrawing to guard.

Also import upstream AppBar changes up to
I4ff8372dc2020b319455ce95cdc1292d80cd2448

Fix: 340829742
Test: manual - with Gallery
Test: manual - with Settings
Change-Id: I02ea173f091c86a8910f93d4cf46f9c8148af3de
diff --git a/packages/SettingsLib/Spa/build.gradle.kts b/packages/SettingsLib/Spa/build.gradle.kts
index e7823df..45667f5 100644
--- a/packages/SettingsLib/Spa/build.gradle.kts
+++ b/packages/SettingsLib/Spa/build.gradle.kts
@@ -41,7 +41,7 @@
 
             defaultConfig {
                 minSdk = 21
-                targetSdk = 34
+                targetSdk = 35
             }
         }