Merge "Add basic ContactsDataKind to ContactsTest (1/2)" into ub-contactsdialer-g-dev
am: 2cc6a2fe7d

Change-Id: I8c3eb6bffa47846ba89f28b7a639b6fe6e30cfa6