Merge "Package battery saver schedule mode in severe battery intent" into tm-dev am: c49fa4a7

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



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