Merge "Merge "Set game_default_frame_rate_override as 60 for AOSP" into android15-tests-dev am: 509f0504" into main am: 6b63dd57 am: a7c7e98a

Original change: https://android-review.googlesource.com/c/platform/build/+/3492810



Change-Id: Ic57e4d8652f619940c64f82a642fe80916905644
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>