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
am: 4577aac5 -s ours
* commit '4577aac5':
DO NOT MERGE ANYWHERE Start the FingnerprintService only if it has FEATURE_FINGERPRINT.