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

Change-Id: I9833e7b15740418b1e19d36a8d4e0aa565dcfcab