Merge "Merge "Crash if lock isn't held when it should be. This will help track down any errors." into rvc-dev am: a785db53 am: fc60e98b am: abdbcb88" into rvc-qpr-dev-plus-aosp am: df22e557

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

Change-Id: Ie44a2133a3bacf4f1f7ecfe5a5653ce07b4df045