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

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

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