Merge "charger: Avoid a couple string constructions" am: b9edfee8a2

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

Change-Id: I3c510bcf3da0d196aede80c5a16865fed39c0d85