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

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

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



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