Merge "Make pip task could be enter split" into udc-dev am: 3b1ad3eb am: e814efce

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



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