Merge "Merge "Set game_default_frame_rate_override as 60 for AOSP" into android15-tests-dev am: 509f0504eb" into main