Merge "Refactor the CSIP and redesign the rule of transferring device" into udc-dev am: 6e8022da am: 887777aa am: d7a849ff am: 1928c96f

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



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