Merge "charger: update resource location" am: a433501f am: 245a129f am: b7c83ed1

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2141533



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