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