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

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

Change-Id: I14876fb85a36c34b62429c509389da1e0aa5e984