Merge "Fixing a condition that can cause deadlock" into sc-dev am: 7447381921

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

Change-Id: If5bff0fa00bf8053fc7223f45f9bba60a4dafe8d