Merge "Update the proper App battery usage string on App info page" into...

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

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



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