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

Change-Id: I40525c3bf6a4e4095f4e68e30187fb52c2bf64f5