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

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

Change-Id: I3fe13c51d5d33f5689f0b4130a33cf3a2777e186