Merge "For battery chart 7-bar case, remove the center two labels according to...

Merge "For battery chart 7-bar case, remove the center two labels according to UX designer's suggestion." into tm-qpr-dev am: 226107f1

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



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