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

[automerger skipped] Merge "Merge "Merge "Add display compat system feature to PackageManager" into android12L-tests-dev am: 191c93b6" into android13-tests-dev am: f2425eb7" into android14-tests-dev am: 0dd8f760 am: 6107222d am: d87a65b4 -s ours

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

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



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