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

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