Merge "Merge "DO_NOT_MERGE Fix primaryRangeIsSingleRate + touch on dVRR" into android15-tests-dev am: 726ca29066" into main