Merge "[automerger skipped] Merge "TestHelper(wifi): Increase timeout for UI registration" into android11-tests-dev am: 12511dee72 -s ours" into android12-tests-dev