Merge "Optimize neighbor unreachability detection probe fallback." am: 1aecd5e878 am: e0f24af4f5

Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/1690573

Change-Id: I3cb732a31a74686824a7ba49c5c6405323e33e6c