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