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: I6dd1c1286b825430251d82ef40307c7507104d3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>