Merge "Avoid potential deadlock" into sc-dev am: f9cd67b01e am: 7cb2bad1db
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14888574 Change-Id: I198f42cf9766eae352a12fcae2262eefbb034e82
This commit is contained in: