[automerger skipped] Handle csip set member automatic pair in Setting am: 629611a4 am: eb412a06 am: 6097f9b8 am: 2d002576 -s ours

am skip reason: Merged-In Idbdd21a1f15b04cc91cbc2d30a5cb4e9b24174b9 with SHA-1 ebea73e3 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903834

Change-Id: Ifc808ce832f9c35cf442f561abebe2520e51df85