[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: d0d99943 -s ours am: bb27847f -s ours am: d880f5b8 -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: I7d8555de519bec31966a8bd28aef7255aacb688e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>