Merge "Rewrite FingerprintService to use HIDL 2.1"