[automerger skipped] Merge "SF: use frame rate override even when the physical...

[automerger skipped] Merge "SF: use frame rate override even when the physical range is single" into udc-qpr-dev am: b91b5e57 am: 87457a38 -s ours

am skip reason: Merged-In I4d6d6ddffd6004022d02329148709204ff9d57db with SHA-1 90f7fd29 is already in history

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



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