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

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



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