Merge "Revert "Handle a special case of lock aliasing during lock verification""
am: 97c465ca6e

Change-Id: I6fbcb000037dac23877bb48e7c5956b00f7ed30c