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

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



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