Merge "Fixing a condition that can cause deadlock" into sc-dev am: 74473819 am: c03dc805 am: cc249282 am: 55b86182

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15558584

Change-Id: Iafc7673bba8334786c2bcc5e966b8e3448e86fad