Merge "Update the proper App battery usage string on App info page" into udc-dev am: bc67d885ec
am: 36ed86a6c5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22753622 Change-Id: I00f6025e1ce9b4357b44c6464103db4d14a08238 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: