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

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

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