Merge "Fixed battery tips card UI." into udc-qpr-dev am: 646c676f am: 7f3062b5

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



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