Merge "Group CSIP device based on CAP" am: 8c0ae12d46 am: 88a9f98e2b am: 190d67ddef

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

Change-Id: Ieec3b299eec5639ffeaa77783029f9bdce2a3c22