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

Merge "Make low battery warning notification dismissable" into tm-dev am: 5470b037 am: a10a46f7 am: c22216f2 am: 351355cc

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



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