Merge "Backup AUTOMATIC_POWER_SAVE_MODE and ADVANCED_BATTERY_USAGE_AMOUNT" into sc-v2-dev am: ae5d3b43ae

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

Change-Id: Ieca8d467a11287794ca489aefec01e5acdef94cd