Merge "Merge history of Nearby" into tm-dev am: acff90b51f

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

Change-Id: I8f8cdca386a5ae8a112f60c73a56aa2c327444f4