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