am 6fe373b1: am 16d7245b: Merge "Prevent Fingerprint when SIM is locked" into mnc-dr-dev

* commit '6fe373b10ef2a2e56745ee2c67588e96f5b8dcad':
  Prevent Fingerprint when SIM is locked