[automerger skipped] Merge "Add vintf_fragments to android.hardware.biometrics.fingerprint@2.1-service" into rvc-dev am: ae15d375 -s ours
am skip reason: Change-Id I97ad0451bb3edfe85d33300baaa41c3fbc5c3cc6 with SHA-1 407776ed is in history
Change-Id: I3cad30e142c4501ddefddbd5efc0c6da3f3f4476