Merge "Set game_default_frame_rate_override as 60 for AOSP" into main