Merge "Crash if lock isn't held when it should be. This will help track down...

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

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

Change-Id: If82c607481ecc32d2501e5749e4db711bc5f1c78