Merge "[automerger skipped] display: Update O6R4 refresh rate limitations am: 536ff9ede8 -s ours am: 4178726482 -s ours" into sc-qpr1-dev-plus-aosp