Merge "[DO NOT MERGE] Add sysUiSessionId between BiometricService and...
Merge "[DO NOT MERGE] Add sysUiSessionId between BiometricService and AuthController" into rvc-dev am: f67a780c am: c3879bf1
Change-Id: I7774651890cdd11a6cc2877fc572e9bca7004b61