Merge "New api in LockSettingsService to get StrongAuth synchronously" into...
Merge "New api in LockSettingsService to get StrongAuth synchronously" into nyc-dev am: d86ac811 am: 1e931771
am: 8dda2244
* commit '8dda2244':
New api in LockSettingsService to get StrongAuth synchronously
Change-Id: Ibb8312c7e8b5920ecd4790882ba63c132b913a47