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

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

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