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
Change-Id: Ieaa640e1df9a9efe54c55ab9c165e58ccda4fbc6