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

Merge "Revert "Fix pip update transaction out of order"" into tm-qpr-dev am: 2899ff81 am: 3f63f47e

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



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