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

Change-Id: Ic9fbeb1fc0d9e894d3f8d7fe04f773f501d5f669