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