Revert "Frameworks/base: move custom string in cm_strings.xml file"

CAF stays in strings.xml

This reverts commit e03e106487c630458815cc9c5a523842b3159ba3.

Change-Id: Idd6fbaf76a3a00b9790e876da8ce9b7555901cb6
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2