Merge "[RESTRICT AUTOMERGE] p2p: make first connection state check more robust" into android11-tests-dev