Settings: Cleanup CAF additions

Change-Id: I8e44eb28abb8c4d08ea453b7c4f3b21d75c00035
Merge "Settings: Cleanup CAF additions" into cm-11.0
Settings: move Ad-hoc strings

Change-Id: I0805765d6dfde2550f1a770593c8c26a7920d7b7
Settings_strings: AST translations

Change-Id: Icd7f2000934dca25d1682d2a03a644d5188238e9
Settings: UG translation.

Change-Id: I815938a96a4ced80bac6c3730cc8df31cbc064c7
Merge cm 'branch cm-11.0' into dcm-11.0_wip