Merge "Prevent Fingerprint when SIM is locked" into mnc-dr-dev