Merge "Fix permission issue during LockSettingsService.dump()"