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 am: be716a54 am: 53394208 am: 3d7001e8

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

Change-Id: I62a4de5671fcc62e771c586829767ba896a8f54c