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

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



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