Move Battery Settings

Change-Id: I1cef026343d81d0e0fcda69b0eab78a7e4cfbf21