update_engine_client_android implement --merge

This flag corresponds to cleanupSuccessfulUpdate function
of IUpdateEngine. It waits until merge completes or fails.

Note that this doesn't initiate a merge if one has not been
started. To initiate a merge, use snapshotctl.

Test: use it without OTA, it exits immediately
Test: use it after applying update before reboot, it exits immediately
   (however, it cancels the update. See b/147819418)
Test: use it after rebooting into new update, it waits until merge
completes.

Bug: 138808328

Change-Id: Id61c21811f2c33397246035788d139b059208b7f

0 files changed, 0 insertions, 0 deletions