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 am: 1088edf2
Change-Id: I6be0a5200d9306ba1907681846262f42b1969578