am 420f2688: Merge "Only listen for fingerprint if needed." into mnc-dev

* commit '420f2688f0ecfafff6b07755e47f0bd0d34b2fc8':
  Only listen for fingerprint if needed.