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

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

Change-Id: I7af73deb26734fdf8f55326a176003c54ac50058