Merge "[CTS] Adopt two behaviors for STA+STA test" into android12-tests-dev am: e0230f4093

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

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