Merge "[Bugfix] avoid deadlock caused by android.bg and RollbackManagerServiceHandler" into main am: 2dbefb7f42

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

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