[automerger skipped] Merge "csip: Add Coordinated Set Identification Profile" am: baea19f1 -s ours

am skip reason: Merged-In I67536ddcc32ace82d63e19426dce19f2bc69cdea with SHA-1 d35f8bcd is already in history

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

Change-Id: I3cb1ce0008db08299e115c5244257f74a724e5a2