Merge "Fix deadlock in RebootEscrowManager" am: 13b99b7549 am: ebe1328c7a am: 1681940320

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

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