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

Change-Id: I644590a0b590a705944908d1a90f6110f0c88166