Merge "Group CSIP device based on CAP" am: 8c0ae12d46

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

Change-Id: I7a2a78bccbe56785a783c514342eed312809adec