[automerger skipped] Merge "Make pip task could be enter split" into udc-dev...

[automerger skipped] Merge "Make pip task could be enter split" into udc-dev am: 3b1ad3eb am: e814efce am: caac071d -s ours am: 58ffe085 -s ours

am skip reason: Merged-In Iaf4f5e305ea8f46be786f0316b4f8a3d2a14c3e9 with SHA-1 7b133ffe is already in history

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



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