Merge "Merge "Add display compat system feature to PackageManager" into...

Merge "Merge "Add display compat system feature to PackageManager" into android12L-tests-dev am: 191c93b6" into android13-tests-dev am: f2425eb7 am: 2e36b04e

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



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