Merge "adb: Fix the 'adb reboot sideload' for A/B devices." am: 9f59a4663c
am: b26579f326

Change-Id: I297f0ca93ea98f520b5b492af23f598f876136b0