SubSettings: Update ActionBar to match Settings

This is invoked from Settings, and looks totally out of place with
plain Holo

Change-Id: I3037632d7bd1216f872ad8bae2efecb7c5dcb099
Telephony: Fix translatables

Change-Id: I75e73cf333b229d75bd8f14cee303c8cd89a08d8
Revert "Revert "Telephony: Move CAF strings""

This reverts commit 986d00fa289865999fb2cc1c97544486ef375040.
Revert "Revert "Telephony: Remove unused strings""

This reverts commit f4d70ae9437a299386ee4bc41708557ddf806889.
Revert "Revert "Telephony: Make strings consistent""

This reverts commit 88fe4df336162d2eac95d051ecac1a82516d637c.
Merge remote-tracking branch 'cm/cm-11.0' into HEAD

Conflicts:
	res/values/cm_strings.xml

Change-Id: I96285a9fcf57956e4fff655a1a4baa1d65056ecc