Merge "csip: seamless pair with the coordinated set" am: 90ba3faab4 am: ad6a3dacb3 am: e24e7e7213

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1829332

Change-Id: I0fc218089bb02600456b87d737c730195c5c9e6a