[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: 526dbe40 -s ours am: 2d43c0c8 -s ours

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

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



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