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

Merge "Merge "Memory leak due to no stop for IpNeighborMonitor." am: 10b62267 am: 1e488831" into rvc-dev-plus-aosp am: 6a952e4f am: 9b3d8736

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

Change-Id: I0fa81701ecb97cb86b695bac72e310acce7681e9