Merge "Refactor the CSIP and redesign the rule of transferring device" into...

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

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



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