Merge "Fixing a condition that can cause deadlock" into sc-dev am: 74473819 am: d3d4714d am: 88ee4628 am: 630bacdd

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

Change-Id: I2ecff0efb6a237def78c8503309405e81007896d