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

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

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