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

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



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