Merge "Fix deadlock between PackageManager and DisplayManager" into main am: 92e95adbec am: c67eaa4542

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

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