Merge "Add test case for ContactsProvider2.rewriteCorpDirectories"