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

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



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