Merge "Update the TimeoutAuthenticationMultiSid test" into main am: d99d7730b8 am: 96a5d15232 am: bd532381bb am: c2b56e388a am: a7d36479cb

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2676695

Change-Id: Ia803a4871a453c530ed37af26a8933863bfd4e16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>