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

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



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