Make locksettings commands go through "cmd lock_settings" am: 7d4a9fd5 am:...

Make locksettings commands go through "cmd lock_settings" am: 7d4a9fd5 am: d406cd0c am: 35d9c380

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2700635



Change-Id: I498b370d8bf9c3195a39729fe6250200fd3542ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>