[Spa] Fix CustomizedAppBar height error

Although this height should not be negative from code, there still some
crashes happens.

Prevent negative value to prevent crash.

Also import upstream changes up to
Ibe64a4f96541f9379e43c137c6f4f30eeaf1794a

Fix: 322390811
Test: manual - with gallery
Change-Id: I7543b58cf458fc0d884bf2ac9bcafe1734171110
diff --git a/packages/SettingsLib/Spa/build.gradle.kts b/packages/SettingsLib/Spa/build.gradle.kts
index 463e9be..335725c 100644
--- a/packages/SettingsLib/Spa/build.gradle.kts
+++ b/packages/SettingsLib/Spa/build.gradle.kts
@@ -29,7 +29,7 @@
 
 allprojects {
     extra["androidTop"] = androidTop
-    extra["jetpackComposeVersion"] = "1.7.0-alpha02"
+    extra["jetpackComposeVersion"] = "1.7.0-alpha03"
 }
 
 subprojects {