[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 -s ours am: 7d61fb57 -s ours
am skip reason: Change-Id I90206a16fff1fa12ca7e37e36d49163b6a83e5c1 with SHA-1 87b5dd44 is in history
Change-Id: I577e470b67b10fcc43f9d1f9664b9959a208a478