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

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

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