Merge "Disable fingerprint after force lock" into mnc-dr-dev