tree 3e38a07850f31f529e24f31cb4704e716e162d99
parent 5ae740f8eb781a167425e679cc531e7eeb196c57
parent e7d2554f18c7918ab665477fe092c18b584e974c
author Treehugger Robot <treehugger-gerrit@google.com> 1632386564 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1632386564 +0000

[automerger skipped] Merge "Update CSIP base uuid devie set into a single device detail preference" am: e7d2554f18 -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: I5b8d4afaa3d6415b2f5745af5539f9ea816fb495