Merge "Merge "New api in LockSettingsService to get StrongAuth synchronously"...
Merge "Merge "New api in LockSettingsService to get StrongAuth synchronously" into nyc-dev am: d86ac811 am: 8806a4bd" into nyc-mr1-dev-plus-aosp
am: 38f8eb34
* commit '38f8eb34':
Change-Id: Icb1e0b372c687d72686055d0e8cc962eb4964134