Merge "Add a Settings.Secure value to store extra battery saver schedule" into...

Merge "Add a Settings.Secure value to store extra battery saver schedule" into tm-qpr-dev am: 1dc27fa1

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



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