Merge "Add IsLockScreenDisabled to dump of LockSettingsService" into main