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: I07d18fd5c472f1ab3f3ad4c37583e9092f4431b4