Merge changes from topic "am-7d5e5bd2fc184e2ebbab7c487e278d31" into main

* changes:
  [automerger skipped] Merge "Revert "DO_NOT_MERGE Fix primaryRangeIsSingleRate + touch on dVRR"" into android15-tests-dev am: e03c39c846 -s ours
  [automerger skipped] Revert "DO_NOT_MERGE Fix primaryRangeIsSingleRate + touch on dVRR" am: de84d8e6c5 -s ours