[automerger skipped] Make locksettings commands go through "cmd lock_settings"...

[automerger skipped] Make locksettings commands go through "cmd lock_settings" am: 7d4a9fd5 am: d406cd0c am: 35d9c380 am: 73ebeb71 am: ce79a4cb -s ours

am skip reason: Merged-In I5881fa074681f6bf1ad2f5969a282d928121ddb2 with SHA-1 4d38b0cd is already in history

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



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