Merge "Memory leak due to no stop for IpNeighborMonitor." am: 10b6226702

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

Change-Id: I8723fa07bdbf067940d1fa0b27b13cd5e39289f6