Merge "Fix pip update transaction out of order" into tm-qpr-dev am: 16712430df

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

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