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

am skip reason: Merged-In I925e4d887c3435239aed0aa0fde7cda2c3a95b3c with SHA-1 9f57691d is already in history

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



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