Merge "Move battery unplug command to the beginning of the test" am: 7691152162 am: ef23d08eed am: 779356c8c1

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

Change-Id: I315fba0dd05f10c12cc1c7ac96149a231442aef8