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

Merge "csip: seamless pair with the coordinated set" am: 90ba3faa am: ad6a3dac am: e24e7e72 am: b133e400 am: 2c4d2352

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

Change-Id: If670ec842207154426fbb4214809b3b5d35a1f19