tree ceb1f2b9782fe6be040a97bcb9cc92b25667b590
parent 4875e6e69b4d73b4e69f2061e19240c72faba89e
parent 49facf582d635bd6fe1ed91c992a37a5e03ccced
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1584229553 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1584229553 +0000

Merge "Consolidate the wait in recovery's reboot" am: a69c69b26f am: 737a2e41bd am: 2bc65f82f6 am: 49facf582d

Change-Id: I06a91627cf75671ee0beee75284add560007dcd9