Merge "Disable battery saver notification based on predicted time left" into...

Merge "Disable battery saver notification based on predicted time left" into tm-dev am: 1d1d37ca am: 99cc1235

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



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