Bring in CMs 3 real Circle battery && also circle dotted batt. [2/2]

Change-Id: Id0b326714cea95c1a4def044bc48aa519bea19dd

Conflicts:

	res/values/arrays.xml
	res/values/strings.xml