Merge "Update LockSettingsCmd's showUsage method to defer to calling...

Merge "Update LockSettingsCmd's showUsage method to defer to calling "locksettings help"." into tm-dev am: a2d50b2b am: a3f8fa91

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



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