Merge changes from topic "start_nearby_cp" am: a3f45ecdff

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

Change-Id: Ib9481f1f91b457092c621f0e3a2dba58f92e4692