[automerger skipped] Merge "[DO NOT MERGE] Add sysUiSessionId between...

[automerger skipped] Merge "[DO NOT MERGE] Add sysUiSessionId between BiometricService and AuthController" into rvc-dev am: f67a780c am: 3e774303 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11416242

Change-Id: I55e15e7ba754d78cf839f8369f27e0579fa0b8c5