[automerger skipped] Merge "Set the frame rate for playback to 60Hz to avoid rate selection bugs" into stage-aosp-udc-ts-dev am: b926d9448f am: bd110ac6ea am: 837e208cbb -s ours

am skip reason: Merged-In I0a95aefa85b97ab183ab82887e451bed1ff24985 with SHA-1 29d58c623a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/24083936

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