[automerger skipped] Merge "Implement the battery tips cards.(1/2)" into...

[automerger skipped] Merge "Implement the battery tips cards.(1/2)" into udc-qpr-dev am: 270b7ef1 am: 42f0193b -s ours

am skip reason: Merged-In I4443cdb21b3ba30900fc2f6fcc21c4c56dc1293f with SHA-1 c4ac7487 is already in history

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



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