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

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

Change-Id: I35fc0305ab1d7f3b765aa2f5aa0fa817d26912a2