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

Change-Id: I5ed8bda4215adc06f095b88ebeb04b452dbe7308