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

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



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