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

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

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

Change-Id: I95cf8d21d3dd64c98693355a79eaacbcb84c60d1