am 033dc46b: Merge "Switch from FingerprintService to FingerprintManager." into mnc-dev

* commit '033dc46bb949a9a5e42ed51bbff1e055a7c58ca2':
  Switch from FingerprintService to FingerprintManager.