Merge "Merge "Extended timeout threshold to account for potentially slower emulator." into android11-tests-dev am: 02e7d1fd4d" into android12-tests-dev am: ef39c24652

Original change: https://android-review.googlesource.com/c/platform/cts/+/2317020

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