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

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



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