[automerger skipped] Merge "Merge "Add display compat system feature to...

[automerger skipped] Merge "Merge "Add display compat system feature to PackageManager" into android12L-tests-dev am: 191c93b6" into android13-tests-dev am: f2425eb7 am: 2e36b04e am: 1bf4bf7a am: 269fa467 -s ours am: a11617b7 -s ours am: c3e70b64 -s ours

am skip reason: Merged-In I1c01965764e308491e0f064f0d3e1129c66101bb with SHA-1 8bab2ef6 is already in history

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



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