[automerger skipped] Moves battery saver warning message below Screen Attention setting. am: 8edf692915
-s ours
am skip reason: Merged-In Ib51a0d73c13700c981d1ca789d2ab669e57d814d with SHA-1 70128d9016
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17359096
Change-Id: Iee7d56ad36129bcdcdf0f54af1751e462f80db00
This commit is contained in: