[automerger skipped] [DO NOT MERGE] Add sysUiSessionId between BiometricService and AuthController am: fa7069d83c am: ce80ab113e am: 865fc3716b am: c39ab3bf9a -s ours

am skip reason: subject contains skip directive

Change-Id: Ib0ea7d528242f504fe9c5172817a2678752eedd8