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: I0fd2ce3274d9a3b3a741ebbb301047c4ddf9d740