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

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

Change-Id: I62a6d303440818e29dfccee0d303e46ba03ed4a9