[automerger skipped] Merge "Fixing a condition that can cause deadlock" am: 773a378390 am: f5e0c3e257 -s ours am: 0ebf14fd61 -s ours
am skip reason: Merged-In I630a0ef2560a8ebd962de54c65e3d6277133a1cb with SHA-1 9b1e1c4c08 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1797475
Change-Id: Id2a17e0c7361ccb322c678c55f8cfc4fe367c324
This commit is contained in: