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

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

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