Merge "[Bugfix] avoid deadlock caused by android.bg and...

Merge "[Bugfix] avoid deadlock caused by android.bg and RollbackManagerServiceHandler" into main am: 2dbefb7f am: 9e2ec571 am: d43dab52

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



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