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

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

Change-Id: I5008f32e1f594a7684ca965c7deb7c24735e615c