tree f929e61f3c5bbeaf7be526948676d82c90a00abb
parent 41c008f09e11113277e4600d2e9e773f5e51240c
parent a11617b7c55399d181cdd11b6387583ac7a5b3d1
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1711684447 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1711684447 +0000

[automerger skipped] Merge "Merge "Add display compat system feature to PackageManager" into android12L-tests-dev am: 191c93b666" into android13-tests-dev am: f2425eb72a am: 2e36b04ea1 am: 1bf4bf7a10 am: 269fa467d6 -s ours am: a11617b7c5 -s ours

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

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

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