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