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

Change-Id: I0754b0bc5ff7f2c60abb6179fd5ba4d8162404ad