Merge "Update CSIP base uuid devie set into a single device detail preference" into stage-aosp-master am: 179a9be4b1 am: 6011f29d3f

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

Change-Id: Ib8a79f3232c0be7aea447dc706a0a711b2e6ec41