Merge changes from topic "presubmit-am-ff33bcede1684834aa31260a377b98b7"

* changes:
  [automerge] Bugfix 2p: 7d5029210d Merged-In: <AOSP-19030214> Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/19030214
  Bugfix Bug:236789888 Test: unit test Ignore-AOSP-First: nearby_not_in_aosp_yet