[automerger skipped] Merge "Merge history of Nearby" into tm-dev am: acff90b51f -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: I2ee8edd3f541c42c2f46064745c2eb4e5facfd4c