Merge "Update the proper App battery usage string on App info page" into udc-dev am: bc67d885

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



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