update 2 more icons
FindBugs: Call to equals() comparing different types

Change-Id: If4185f9eec0adfa47a6741eb21111b6cdafac008
Settings: Add cLock settings back to lockscreen settings

Change-Id: I00153e63e39e312b5ff097a4e651f2bbf33d7b4b
Settings: Add AOSP dummy strings

Add some empty strings to remove aapt warnings caused by
aosp strings without default translation.

Change-Id: I96f36e9768977d70bcc8ce717eb677c50ef4982d

Conflicts:

	res/values/cm_strings.xml
add low battery indicator options