[automerger skipped] Merge "Impl dismiss action in battery tips cards." into...

[automerger skipped] Merge "Impl dismiss action in battery tips cards." into udc-qpr-dev am: 4b4328cb am: cffee3ec -s ours

am skip reason: skipped by user guanxin

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



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