[automerger skipped] Merge "csip: Add Coordinated Set Identification Profile"...

[automerger skipped] Merge "csip: Add Coordinated Set Identification Profile" am: 540b4f23 -s ours am: 7ccea47a -s ours am: 31454fe4 -s ours am: 1d6b0612 -s ours am: f84dfdf7 -s ours

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

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

Change-Id: I766c1f1d260fc848c54049a773600cd5d7167bd4