[automerger skipped] Merge "[RESTRICT AUTOMERGE] p2p: make first connection state check more robust" into android11-tests-dev am: ed6917d848 -s ours am: bbb9611eaf -s ours

am skip reason: subject contains skip directive

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

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