Merge "Move battery unplug command to the beginning of the test" am: 7691152162 am: ef23d08eed am: 0d80b279fe am: 4ee5fff9df

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1769295

Change-Id: Id2044de6be2c9d961c3223136979d1f0544aa75b