[automerger skipped] DO_NOT_MERGE Fix primaryRangeIsSingleRate + touch on dVRR am: 12b90231b4 -s ours

am skip reason: Merged-In Ic5b2b298fe0df357f77ef8f06b1fc0fc248e0498 with SHA-1 7bedfbf0d7 is already in history

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

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