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

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

Change-Id: I588c5b1a10d43fc46d7a4a49a77d4f6eb841fd95