Merge "Avoid hardcoding BATTERY_PLUGGED_ANY constant." am: bdd3ca1ac6

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

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