[automerger skipped] Merge "VRR: Allowlist for small area detection" into...

[automerger skipped] Merge "VRR: Allowlist for small area detection" into udc-qpr-dev am: 89270bc7 am: 3e0566ee -s ours

am skip reason: Merged-In Iaf6c0090f9db499fc5ed097b2d3c6d9d871d4812 with SHA-1 9ac5e6e6 is already in history

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



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