Merge "Avoid hardcoding BATTERY_PLUGGED_ANY constant." am: bdd3ca1ac6 am: 5e24ea8cc5 am: c3f28cb257

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

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