Merge "Make icons colorful for Security settings." into oc-dev
am: 9f7e705426

Change-Id: I397599ce60a3a334aae17ad77dfa94c4e7b24398