Merge "Merge "Introduce new lock to avoid lock-ordering issues." into sc-dev...

Merge "Merge "Introduce new lock to avoid lock-ordering issues." into sc-dev am: 0298091d am: 7d4ab1c2" into sc-qpr1-dev-plus-aosp am: 5666ac5b am: bcbc91e7

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

Change-Id: I9c9bf33eaef896c552a9bdc3170d63806c1db20e