Make locksettings commands go through "cmd lock_settings" am: 7d4a9fd502 am: d406cd0c5e

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

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