Merge "Revert "Fix doing silent update,power cut/restoration,screen is turned...

Merge "Revert "Fix doing silent update,power cut/restoration,screen is turned on"" am: 33f7eacc am: 4139617b am: 1d35655b

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



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