Merge cherrypicks of ['googleplex-android-review.googlesource.com/33930990', 'googleplex-android-review.googlesource.com/34775661'] into 25Q3-release.

Change-Id: Idfb1646fd4102a95653c0c8b2cbfca0f39a9eb68

core/java/android/view/ViewRootImpl.java

diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index 0ccb0b9..40d6318 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -3496,9 +3496,6 @@
      * TODO(b/260382739): Apply this to all windows.
      */
     private static boolean shouldOptimizeMeasure(final WindowManager.LayoutParams lp) {
-        if (com.android.window.flags.Flags.reduceUnnecessaryMeasure()) {
-            return true;
-        }
         return (lp.privateFlags & PRIVATE_FLAG_OPTIMIZE_MEASURE) != 0;
     }
 

core/java/android/window/flags/windowing_frontend.aconfig

diff --git a/core/java/android/window/flags/windowing_frontend.aconfig b/core/java/android/window/flags/windowing_frontend.aconfig
index 92dbdc5..26aa270 100644
--- a/core/java/android/window/flags/windowing_frontend.aconfig
+++ b/core/java/android/window/flags/windowing_frontend.aconfig
@@ -247,17 +247,6 @@
 }
 
 flag {
-  name: "reduce_unnecessary_measure"
-  namespace: "windowing_frontend"
-  description: "Skip measuring view hierarchy if the size is known"
-  bug: "260382739"
-  is_fixed_read_only: true
-  metadata {
-    purpose: PURPOSE_BUGFIX
-  }
-}
-
-flag {
   name: "ensure_keyguard_does_transition_starting"
   namespace: "windowing_frontend"
   description: "Ensure that keyguard is the one starting transitions, instead of delegating to Core"