Merge "Improve the help text for the locksettings shell command" into main am:...

Merge "Improve the help text for the locksettings shell command" into main am: d3a4b7a0 am: 2891671f

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



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