Forward Port Circle Battery

Change-Id: I587548834f70874e74f3e986fcb187c2c9d3a1cd

Conflicts:

	res/values/cm_arrays.xml
Settings: Add preference for EdgeGesture service.

Change-Id: I0325b0a9aa6eb943b48483aebe151726a2c64ac4

Conflicts:

	res/values/cm_strings.xml