[automerger skipped] Merge "Moves battery saver warning message below Screen Attention setting." into tm-dev am: 5b9c125bb7 -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: Iddce69d48e133c8f104c9d94e8f33ee4b3b3f43c
This commit is contained in: