Thinlock unlocking was incorrectly unconditionally ending a block. Bug: 28423466 (cherry picked from commit 825ab1c3) Change-Id: Ifaebd9e959041e157e292d4cba05675a37e9c700