Merge "Bugfix Bug:236789888 Test: unit test Ignore-AOSP-First: nearby_not_in_aosp_yet" into tm-mainline-prod am: 3d5f26acb4

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/19030214

Change-Id: I08ffe0d1e1e69dbd9e79932c3e5492ab08923502
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>