Merge "New api in LockSettingsService to get StrongAuth synchronously" into nyc-dev am: d86ac8116b
am: 1e93177121

* commit '1e93177121848f337c512b7ce0d06265abb02356':
  New api in LockSettingsService to get StrongAuth synchronously

Change-Id: If568c19a9fb67eb847b776981a42049cececfe45