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
am: 1886efacfc  -s ours

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