[automerger skipped] Merge "Improve battery tips cards." into udc-qpr-dev am:...

[automerger skipped] Merge "Improve battery tips cards." into udc-qpr-dev am: 3670fe12 am: 09950188 -s ours

am skip reason: Merged-In I356648d0fcec5dd1ea724297187ecafb5be55fd8 with SHA-1 14d0a1c1 is already in history

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



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