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

Change-Id: I32aa193560f6aa801e20a785ab3aef641cd65a8f