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 am: 58a0e036

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



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