Merge "Fix pip bundling" into tm-qpr-dev am: 97b292f6

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



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