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