Merge "Update CSIP base uuid devie set into a single device detail preference" into stage-aosp-master