Merge "Add vintf_fragments to android.hardware.biometrics.fingerprint@2.1-service" am: 542841648c

Change-Id: I61ed6705259569112ccdabfe0c26fb5e7e33b1d3