Fix broken build.

Missed two methods during a refactor.  Updating new class prefixes for them.

Bug: 8182147
Change-Id: If3476adf043f2192b53bfaa9fc03c8149a181005
diff --git a/tests/src/com/android/providers/contacts/ContactsProvider2Test.java b/tests/src/com/android/providers/contacts/ContactsProvider2Test.java
index da3a125..74d0e69 100644
--- a/tests/src/com/android/providers/contacts/ContactsProvider2Test.java
+++ b/tests/src/com/android/providers/contacts/ContactsProvider2Test.java
@@ -3414,12 +3414,12 @@
             return;
         }
         ContactLocaleUtils.setLocale(Locale.US);
-        long rawContactId = createRawContact(null);
+        long rawContactId = RawContactUtil.createRawContact(null);
 
         ContentValues values = new ContentValues();
         values.put(StructuredName.GIVEN_NAME, "\u7A7A\u6D77");
         values.put(StructuredName.PHONETIC_GIVEN_NAME, "\u304B\u3044\u304F\u3046");
-        insertStructuredName(rawContactId, values);
+        DataUtil.insertStructuredName(mResolver, rawContactId, values);
 
         long contactId = queryContactId(rawContactId);
         // en_US should behave same as ja_JP (match on Hiragana and Romaji