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

Change-Id: I8e71ea1d28a6494c87eb8b588f2590f6e4b617ff