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

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



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