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: I67be359ab3c86c6eed4074c2bd95cb527c856686