Merge "Fix setting crash when removing screenlock with fp" into oc-dev
am: 339d117b46

Change-Id: I2fa18ac32053f3390d6cb821042ea0c63e6f4e86