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

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



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