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

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



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