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

* commit '9b6b6656b8848a2347996fab7f802b49edc8147f':
  Switch from FingerprintService to FingerprintManager.