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

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

Change-Id: I17cb45059f03a550603e149eb071c1b410717d4c