[automerger skipped] Merge "[DO NOT MERGE] Add sysUiSessionId between BiometricService and AuthController" into rvc-dev am: f67a780c33 am: c3879bf191 am: 3f70c0287c am: 904b44ba55 -s ours

am skip reason: subject contains skip directive

Change-Id: Icf536527c0ceda5907d6ec375adb933f5f818024