[automerger skipped] Merge history of Nearby am: d84be86d24 -s ours

am skip reason: Merged-In I7fd9cc67244f2533057e679b0bc5e1db126cd399 with SHA-1 3d3931a240 is already in history

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

Change-Id: Ie8744a8b5fdbed7600fdc79d3ea42cd81f3575cd