Merge "BatteryService: Typo fix ("Charing" -> "Charging")" into main am: c33762ca7a am: f0eed743f8

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3197296

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