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

* commit '8806a4bdc8ce04fd658781498516983d2bef48dc':
  New api in LockSettingsService to get StrongAuth synchronously

Change-Id: I48e3e21e2fe84c64c0e90562202b3cc67b28601f