Merge "Change battery usage dropdown list item texts from "Breakdown by ..."...

Merge "Change battery usage dropdown list item texts from "Breakdown by ..." to "By ..."" into udc-dev am: 8609ef22 am: 72823d81

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



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