Merge "Send callingUserId from AuthService -> BiometricServiceBase" into rvc-dev am: 20534dcc am: e4057a49 Change-Id: I82834cc0afe10493a7858aa89a8933da8c552511