Merge "[automerger skipped] display: Update O6R4 refresh rate limitations am: 536ff9ede8 am: 2dc1272a39 -s ours am: 15480fe1ef -s ours" into sc-v2-dev-plus-aosp am: 58b3fa68ad -s ours

am skip reason: Merged-In I2bebff0b5c0677e83a55168332bb2271a073bae1 with SHA-1 536ff9ede8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/15927845

Change-Id: If77d73b33b460635e2868d4f334ab6057d4ff8ea