Merge "DO NOT MERGE ANYWHERE Start the FingnerprintService only if it has FEATURE_FINGERPRINT." into cw-e-dev am: fbd88d132e  -s ours
am: 4577aac551  -s ours

* commit '4577aac5510db6c3255a5e09a573c52bbfa8b609':
  DO NOT MERGE ANYWHERE Start the FingnerprintService only if it has FEATURE_FINGERPRINT.