Merge "Add a Settings value to store extra battery saver state" into udc-dev am: c4a37b60 am: 606a19b5

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



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