Merge "Update string for battery usage footer to include charging info" into sc-dev am: 40114d8cf1

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14327007

Change-Id: Ie495e3a506a44cc1a97ac2f1d4fe16224b038475