Merge "Remove everything from under the lock." into sc-dev am: 4895062e am: da61285b am: fb5bcb43

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

Change-Id: I292b0bf69ca7a85e365e6453904dad6496be817e