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

* commit '35e87811cb116535aec816bc3dbe17965e4328bf':
  Switch from FingerprintService to FingerprintManager.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base