[automerger skipped] Merge "Eliminate potential deadlock in AccessibilityCache" am: e6510baf3b am: 0d21e173f9 -s ours
am skip reason: Merged-In I27e4e64f778ae1c2a348e16cf8739f7a5596e0fc with SHA-1 1427156afc is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1736248
Change-Id: I33f5c0149a1ce5865cba08e826632761a4efc4e3
This commit is contained in: