Merge "Improve pip to split transition" into tm-qpr-dev am: 95eb72f9 am:...

Merge "Improve pip to split transition" into tm-qpr-dev am: 95eb72f9 am: 8d1d4fa2 am: a6aca431 am: 39a62ce1

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



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