Merge "Fixing a condition that can cause deadlock" into sc-dev am: 7447381921 am: c03dc8059e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15558584 Change-Id: I881526065de0b69ba2ed9042dba79de846a6042e
This commit is contained in: