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

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

Change-Id: I2e85fbbb8cafbb11e67790fae69ff90e812ec05a