Merge "Move the wait-for-barrier command to after the battery state change." into udc-dev am: fbf94b9a52 am: af15ad90c7

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

Change-Id: I3106dd5d7bfcf2aaa8fda64a87d2149372641623
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>