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

Change-Id: I9ef51c3617ffb3957000c5790ddf66b9669255ef