[automerger skipped] Merge "DO_NOT_MERGE Fix primaryRangeIsSingleRate + touch...

[automerger skipped] Merge "DO_NOT_MERGE Fix primaryRangeIsSingleRate + touch on dVRR" into android15-tests-dev am: 726ca290 am: c73f2d09 -s ours am: 7ab30b28 -s ours

am skip reason: Merged-In Ic5b2b298fe0df357f77ef8f06b1fc0fc248e0498 with SHA-1 12b90231 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3275058



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