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

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



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