Merge "Test that IpNeighborMonitor is stopped when IpServer stops." am: d4e50ab409 am: a5edc98546

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1343441

Change-Id: Iddcf13599efd093b2cf2d2228a3f7be69178e5fc