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

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

Change-Id: Ib85a821e6391b6b984d852ca79f2443f418de9c5