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: 7be14160 am: 9ae13bf0 am: 0685a25d

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



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