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

Change-Id: Ia3b8aa1120be685b3e047c089d76fa013d0ee241