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

Change-Id: I0501565252acb32f2a04cb3a005c9ec776a8afef