Merge "Add IsLockScreenDisabled to dump of LockSettingsService" into main am: 312fe7c40c am: 31584c6bf7

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

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