Merge "Add vintf_fragments to android.hardware.biometrics.fingerprint@2.1-service"