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: fb6cb4a1 am: fc33ab79
Change-Id: Ieb9210e543f69e9bf1b7e4a3eb32fca8dd6a74fd