Merge changes from topics "biometrics.face@1.1-revert", "biometrics.fingerprint@2.2-cleanup" into rvc-dev am: c2a2d6c66b

Change-Id: I1aa4ff523fc0e784f162b91c491fe3607deaacbb