Merge "New api in LockSettingsService to get StrongAuth synchronously" into nyc-dev