Merge "Update LockSettingsCmd's showUsage method to defer to calling "locksettings help"." into tm-dev am: a2d50b2bbf am: 821f3b795b am: 2de475719c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17575563 Change-Id: I6c87c612a67111f743f1686c26d480c5097d510f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: