[automerger skipped] Merge "Update CSIP base uuid devie set into a single device detail preference" am: e7d2554f18 -s ours

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

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

Change-Id: I5b8d4afaa3d6415b2f5745af5539f9ea816fb495