Merge "LockSettingsShellCommand: improve an error message" into main am: 46d267471c am: 5cf91603dc

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

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