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

Change-Id: I06205cc9f5b5826071ba74995fa852bb1439c678