Merge "LockSettingsStrongAuth shouldn't get fingerprintservice on unsupported devices" into oc-mr1-dev