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

[automerger skipped] Revert "DO_NOT_MERGE Fix primaryRangeIsSingleRate + touch on dVRR" am: de84d8e6 -s ours

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

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

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



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