[automerger skipped] Merge "Fixing a condition that can cause deadlock" am:...

[automerger skipped] Merge "Fixing a condition that can cause deadlock" am: 773a3783 am: f5e0c3e2 -s ours am: 0ebf14fd -s ours am: 2ff8c6e4 -s ours

am skip reason: Merged-In I630a0ef2560a8ebd962de54c65e3d6277133a1cb with SHA-1 9b1e1c4c is already in history

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

Change-Id: I0495b1deaf100a7b9da920972dbd17e1c935bb27