Merge "Move DirectoryCompat from "contacts/common" to "dialer/common/cp2"."