[automerger skipped] Add Battery Defender feature to Settings am: 7ccb54feb6 am: 974f359a26 -s ours
am skip reason: Change-Id Ibb106a5d42cdf6232abf9ddf4b3225bdcebccf4a with SHA-1 9a6aae5006 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13108999
Change-Id: I3c7679781dede71b336f7784129425484a19985f
This commit is contained in: