Settings: Cleanup CAF additions

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

Change-Id: I0805765d6dfde2550f1a770593c8c26a7920d7b7
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0