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