Merge Android 24Q2 Release (ab/11526283) to aosp-main-future

Bug: 337098550
Merged-In: I96574a79eba581db95d387f0d9c9fde2e004c41c
Change-Id: Ib9f2c742f8aa72651ef9eca80a716dd94b9041ea

aconfig/settings_development_flag_declarations.aconfig

@@ -6,6 +6,13 @@ container: "system_ext"
 # NOTE: All Settings flags share the same Flags class, so prefix our
 # flags with 'development' to prevent naming collision.
 
+flag {
+    name: "development_game_default_frame_rate"
+    namespace: "game"
+    description: "This flag guards the new behavior with the addition of Game Default Frame Rate feature."
+    bug: "286084594"
+}
+
 flag {
   name: "development_hdr_sdr_ratio"
   namespace: "core_graphics"