Merge "Refactor the CSIP and redesign the rule of transferring device" into udc-dev am: 6e8022da am: 0a76f449 am: 4f22e0b6 am: ee7a55b7

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



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