Merge changes from topic "start_nearby_cp" am: a3f45ecdff

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

Change-Id: Ia86c12c0ea244ca170c1e221aa692310c81f87fd