Merge "Improve battery tips cards." into udc-qpr-dev am: 3670fe12

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



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