Merge "Fix doing silent update,power cut/restoration,screen is turned on" am: f07eaeb72e am: 859ebabebd am: 50ed6648b1 am: cfccc925f6

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2229081

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