[automerger skipped] Enable i18n for battery tips card and fix b/297036263. am: ab00ac09 -s ours

am skip reason: Merged-In I41aff99c73ace995ef9dfa8f1dc28024cd12d236 with SHA-1 068adaf1 is already in history

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



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