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: c0e8e101

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



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