Merge "Remove everything from under the lock." into sc-dev am: 4895062e am: 78e2c7b4 am: 03e56294

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

Change-Id: I4ec812c1147a5214a7c2a7cca45a53178f1f3f74