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

Change-Id: I12840a546b585d84563e857eb589517e161270ae