Added Android lock/unlock feature
Merge pull request #3638 from 0x1mason/unlockDevice

Added Android lock/unlock feature: #3342 Fix