tree ceb1f2b9782fe6be040a97bcb9cc92b25667b590
parent b28d0cdbfa35bca427b4104c73c07ae9cb0a3d10
parent 737a2e41bde4581bbbe12c3f54eed4d55d15c7e6
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1584227081 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1584227081 +0000

Merge "Consolidate the wait in recovery's reboot" am: a69c69b26f am: 737a2e41bd

Change-Id: I962b324436ab4139ed2fa24430599d9403a983e1