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