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

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