[automerger skipped] Merge "Enable i18n for battery tips card and fix...

[automerger skipped] Merge "Enable i18n for battery tips card and fix b/297036263." into udc-qpr-dev-plus-aosp am: 10d3e1e0 -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: If119289c0638cf8e7ee7366abe4cd165a0f58d5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>