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

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

Change-Id: I3c4548a0016174ccf44076d2bf72a42154396046