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

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

Change-Id: I868736aff2e56a14528e4ca1250d74b9af42b0f6