Merge "Tweak LockSettingsService dump output"