Merge cherrypicks of ['googleplex-android-review.googlesource.com/25104428',...

Merge cherrypicks of ['googleplex-android-review.googlesource.com/25104428', 'googleplex-android-review.googlesource.com/25104429', 'googleplex-android-review.googlesource.com/25104430'] into 24Q1-release.

Change-Id: I3e6e9c369f634ae9470dbf51f4a440a73397391e

packages/SystemUI/src/com/android/systemui/flags/Flags.kt

@@ -259,7 +259,7 @@ object Flags {
     // TODO(b/290652751): Tracking bug.
     @JvmField
     val MIGRATE_SPLIT_KEYGUARD_BOTTOM_AREA =
-        releasedFlag("migrate_split_keyguard_bottom_area")
+        unreleasedFlag("migrate_split_keyguard_bottom_area", teamfood = true)
 
     // TODO(b/297037052): Tracking bug.
     @JvmField
@@ -274,7 +274,7 @@ object Flags {
 
     /** Migrate the lock icon view to the new keyguard root view. */
     // TODO(b/286552209): Tracking bug.
-    @JvmField val MIGRATE_LOCK_ICON = releasedFlag("migrate_lock_icon")
+    @JvmField val MIGRATE_LOCK_ICON = unreleasedFlag("migrate_lock_icon", teamfood = true)
 
     // TODO(b/288276738): Tracking bug.
     @JvmField val WIDGET_ON_KEYGUARD = unreleasedFlag("widget_on_keyguard")

packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/DefaultAmbientIndicationAreaSection.kt

@@ -50,8 +50,11 @@ constructor(
 
     override fun addViews(constraintLayout: ConstraintLayout) {
         if (featureFlags.isEnabled(Flags.MIGRATE_SPLIT_KEYGUARD_BOTTOM_AREA)) {
-            LayoutInflater.from(constraintLayout.context)
-                .inflate(R.layout.ambient_indication, constraintLayout, true)
+            val view =
+                LayoutInflater.from(constraintLayout.context)
+                    .inflate(R.layout.ambient_indication, constraintLayout, false)
+
+            constraintLayout.addView(view)
         }
     }