[automerger skipped] Merge "Group CSIP device based on CAP" am: 8c0ae12d am:...

[automerger skipped] Merge "Group CSIP device based on CAP" am: 8c0ae12d am: 88a9f98e am: 190d67dd am: 02d8bafb -s ours

am skip reason: Merged-In Ia3d0dbe496dec822fee8ae6465b81688b9e9440c with SHA-1 436bffbd is already in history

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

Change-Id: I4fbc96ab0707a6e90a3190d9d70f464dec9692d3