Settings: Cleanup CAF array

* I forgot this file in my previous commit

Change-Id: I0ce9303ec4e67df328fbb07c8f18f5e002ac8ea6
Merge "Settings: Cleanup CAF array" into cm-11.0
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0