Merge "Fix doing silent update,power cut/restoration,screen is turned on" am:...

Merge "Fix doing silent update,power cut/restoration,screen is turned on" am: f07eaeb7 am: 859ebabe am: 50ed6648

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



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