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

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



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