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

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

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