Merge "Move DirectoryCompat from "contacts/common" to "dialer/common/cp2"." am: 79eb6bd969 am: 67e3cbd53e
am: 848f23a19b

Change-Id: Iae1a14cf654ea33781f48bf350a52eb4d8546140