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

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

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