Merge "Fix rare edge-cases pip crashes" into tm-qpr-dev am: a6e0a8ea

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



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