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