Merge "Refactor the CSIP and redesign the rule of transferring device" into udc-dev am: 6e8022da

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



Change-Id: I092b97e522ef7fd58aafe0f5f13ab7dae724cbc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>