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: 791dae59 am: f7d51917

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



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