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

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

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