am 60ce06db: am 0a17fb4e: Merge "Move from native FingerprintService implementation to fingerprintd" into mnc-dev

* commit '60ce06db20b41fed23460e927f9a51ecaa5b1bee':
  Move from native FingerprintService implementation to fingerprintd