Merge changes from topic "start_nearby_cp" am: a3f45ecdff am: 4049ab3b87

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

Change-Id: Ide11b0a42aa66f3987c67f11cb2205372daf8e87