Move lock before unlock to Security settings

Revert "CarbonFibers: Lock before unlock the new way (2/2)"

This reverts commit b6f97147ee2544ea544b8b4ce52ed3e3f58375c6.

Change-Id: Ide63aaff0125f2a6fbf4c34c762360b1ec96b188
Merge "Move lock before unlock to Security settings" into kk