Merge "Change battery usage screen component name" into udc-dev am: 6ebcbdb2

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



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