Merge "Add biometrics.fingerprint@2.2 to the current matrix" into rvc-dev-plus-aosp