Added Android lock/unlock feature: #3342 Fix

I got this working.  Tests require pending changes to wd project.  We'll need client and doc changes for this as well, but wanted to go ahead and get it up for @austenke to look over if he has time.

Also, @austenke please lmk if you worked on the docs or any clients.
Goal of refactoring was to unify name across server and devices.