Revert "Framework and SystemUI: Refactor CM Additions resources"

This reverts commit 0427cfbf9ad4ddfe0904f718b6b435d45a6d5abb.

Conflicts:
	packages/SystemUI/res/values/cm_strings.xml