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: 821f3b79

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



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