Merge "Introduce new lock to avoid lock-ordering issues." into sc-dev am: 0298091d am: 7d4ab1c2

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

Change-Id: I3f167d71a5d4f256ecb1d455eddc621e22b5d106