[automerger skipped] Merge "Add support to make the refresh rate used when the...

[automerger skipped] Merge "Add support to make the refresh rate used when the device has HDR enabled configurable for each display." into tm-qpr-dev am: 6fc081bd am: dd341459 -s ours

am skip reason: Merged-In Ia76f732274eea08ad83e8479820fb096eb134dee with SHA-1 35b8ec4a is already in history

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



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