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

[automerger skipped] Merge "Merge "DO_NOT_MERGE Fix primaryRangeIsSingleRate + touch on dVRR" into android15-tests-dev am: 726ca290" into main am: 9f3ef6e2 -s ours am: 544abfd8 -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: I43630610071fc56a8297e5fddbe88ac5f31cbe91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>