Merge changes from topic "am-fa33a383ff0f4e08be1cb49d59f1732d" into android12-tests-dev

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