[automerger skipped] Merge "Fix deadlock between PackageManager and...

[automerger skipped] Merge "Fix deadlock between PackageManager and DisplayManager" into main am: 92e95adb am: c67eaa45 am: 8fcf2d6f -s ours

am skip reason: Merged-In I3dea7b1df6f115d7c1cffda6a9d51070a5d7dd80 with SHA-1 1e7589af is already in history

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



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