am af5de85b: am 64117fef: am 4b3bc882: am bf9a425d: Merge "Simplify FingerprintSettings" into mnc-dev

* commit 'af5de85bc0797449005c028e21a8af7a3c460901':
  Simplify FingerprintSettings