track our ContactsCommon

Change-Id: I33e7b390e24533d86b9d5e06a2b8939a550bdeae
remove display-caf (again)

Change-Id: I860ff84433bafbac2eab1cd5dd311f39b0e25c2b
replace keymaster

Change-Id: Id116e279b11218dda4b0563bbd8a1fae64866280