Merge "Add permission checking on service calls in LockSettingsService" into nyc-dev