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

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



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