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

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

Change-Id: Id4413aeaa1c12c52e2fa5740bab9cff2602e166a