[automerger skipped] Merge "Backup AUTOMATIC_POWER_SAVE_MODE and...

[automerger skipped] Merge "Backup AUTOMATIC_POWER_SAVE_MODE and ADVANCED_BATTERY_USAGE_AMOUNT" into sc-v2-dev am: ae5d3b43 am: 76d9649e -s ours

am skip reason: Merged-In I2eaafec6704c0a0d2a2fb3c301fa9c904f7d3ac4 with SHA-1 c315a75d is already in history

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

Change-Id: I6c7854694bf2a01bfc2374619c660129cbd591ae