[automerger skipped] Merge "Update CSIP base uuid devie set into a single...

[automerger skipped] Merge "Update CSIP base uuid devie set into a single device detail preference" am: e7d2554f -s ours am: 31b986da -s ours am: 77f6cbc5 -s ours am: 28aca894 -s ours

am skip reason: Merged-In I1a8d570da1af7fa4c8b3a99f8ce69d23b574e96c with SHA-1 a1868538 is already in history

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

Change-Id: I51aa6306beef81419ea58ddba8cb4beda5eb0521