Merge changes from topic "start_nearby_cp" am: a3f45ecdff am: 364196b58a

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

Change-Id: Id8c8c9c759e51a609620db47f8f38242e7b9f11e