[automerger skipped] Merge "Wait for IpClient.StoppedState#enter before tests"...

[automerger skipped] Merge "Wait for IpClient.StoppedState#enter before tests" into rvc-dev am: b91dc822 am: 0162c4fc am: 5e3fdc1c -s ours

am skip reason: Change-Id I90206a16fff1fa12ca7e37e36d49163b6a83e5c1 with SHA-1 87b5dd44 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/11321200

Change-Id: Ifcf95ce4d3a3c386889c44addd31febb38f480f0