Merge "Simplify pip tests" into udc-qpr-dev am: 93381a1a

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



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