Revert "DO_NOT_MERGE Fix primaryRangeIsSingleRate + touch on dVRR"

This reverts commit 5cf032c4c53f5930091be2a145530d49bce7fae5.

Reason for revert: Verify for b/369245024

Change-Id: Iccf7a22419bf3af1ea0818e0bf5d2917747df183
Merged-In: Ic5b2b298fe0df357f77ef8f06b1fc0fc248e0498
2 files changed