Merge "Revert "Fix doing silent update,power cut/restoration,screen is turned on"" am: 33f7eaccd3 am: 4139617b9e

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

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