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: I501d890dc0637d97671ff531d9a8b8b255a6273d