[automerger skipped] Merge "Update CSIP base uuid devie set into a single device detail preference" am: e7d2554f18 -s ours am: 31b986daf2 -s ours am: 77f6cbc51b -s ours am: 28aca89451 -s ours am: a8d17002ba -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: I65a655bd4db62c942029c08f311bf45f0303c535
This commit is contained in: