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

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

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