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

[automerger skipped] Merge "Revert "DO_NOT_MERGE Fix primaryRangeIsSingleRate + touch on dVRR"" into android15-tests-dev am: e03c39c8 -s ours am: 3194e9f2 -s ours

am skip reason: Merged-In Ic5b2b298fe0df357f77ef8f06b1fc0fc248e0498 with SHA-1 5cf032c4 is already in history. Merged-In was found from reverted change.

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



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