Settings: Cleanup CAF additions

Change-Id: I8e44eb28abb8c4d08ea453b7c4f3b21d75c00035
Settings: Cleanup CAF array

* I forgot this file in my previous commit

Change-Id: I0ce9303ec4e67df328fbb07c8f18f5e002ac8ea6
Merge remote-tracking branch 'upstream/kk' into kk