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: Ifa36325db77fe06b13ec95310b07b2df03d4ce29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>