Merge "Make low battery warning notification dismissable" into tm-dev am:...

Merge "Make low battery warning notification dismissable" into tm-dev am: 5470b037 am: ae042a08 am: b1192d2a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18512408



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