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: I9c72388c8622513c4263a45ac3b0e872bcb9e5dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>