am 6fdb85d3: am 120fc2c7: Merge "Disable fingerprint when remotely reset by DPM" into mnc-dev

* commit '6fdb85d383007e7d68895195d6347840276abeab':
  Disable fingerprint when remotely reset by DPM