[Android] Move the java content/ package to content_public/ to start the split.

chrome/android/testshell/java/AndroidManifest.xml

Index: chrome/android/testshell/java/AndroidManifest.xml
diff --git a/chrome/android/testshell/java/AndroidManifest.xml b/chrome/android/testshell/java/AndroidManifest.xml
index 99b436fb742671b79108a2caba49d7f0c6750d7b..80dd59a0e955753fbe2f753d782ae7e76a1d7ce2 100644
--- a/chrome/android/testshell/java/AndroidManifest.xml
+++ b/chrome/android/testshell/java/AndroidManifest.xml
@@ -56,67 +56,67 @@
 
         <!-- NOTE: If you change the values of "android:process" for any of the below services,
              you also need to update kHelperProcessExecutableName in chrome_constants.cc. -->
-        <service android:name="org.chromium.content.app.SandboxedProcessService0"
+        <service android:name="org.chromium.content_public.app.SandboxedProcessService0"
                  android:process=":sandboxed_process0"
                  android:permission="org.chromium.content_shell.permission.SANDBOX"
                  android:isolatedProcess="true"
                  android:exported="false" />
-        <service android:name="org.chromium.content.app.SandboxedProcessService1"
+        <service android:name="org.chromium.content_public.app.SandboxedProcessService1"
                  android:process=":sandboxed_process1"
                  android:permission="org.chromium.content_shell.permission.SANDBOX"
                  android:isolatedProcess="true"
                  android:exported="false" />
-        <service android:name="org.chromium.content.app.SandboxedProcessService2"
+        <service android:name="org.chromium.content_public.app.SandboxedProcessService2"
                  android:process=":sandboxed_process2"
                  android:permission="org.chromium.content_shell.permission.SANDBOX"
                  android:isolatedProcess="true"
                  android:exported="false" />
-        <service android:name="org.chromium.content.app.SandboxedProcessService3"
+        <service android:name="org.chromium.content_public.app.SandboxedProcessService3"
                  android:process=":sandboxed_process3"
                  android:permission="org.chromium.content_shell.permission.SANDBOX"
                  android:isolatedProcess="true"
                  android:exported="false" />
-        <service android:name="org.chromium.content.app.SandboxedProcessService4"
+        <service android:name="org.chromium.content_public.app.SandboxedProcessService4"
                  android:process=":sandboxed_process4"
                  android:permission="org.chromium.content_shell.permission.SANDBOX"
                  android:isolatedProcess="true"
                  android:exported="false" />
-        <service android:name="org.chromium.content.app.SandboxedProcessService5"
+        <service android:name="org.chromium.content_public.app.SandboxedProcessService5"
                  android:process=":sandboxed_process5"
                  android:permission="org.chromium.content_shell.permission.SANDBOX"
                  android:isolatedProcess="true"
                  android:exported="false" />
-        <service android:name="org.chromium.content.app.SandboxedProcessService6"
+        <service android:name="org.chromium.content_public.app.SandboxedProcessService6"
                  android:process=":sandboxed_process6"
                  android:permission="org.chromium.content_shell.permission.SANDBOX"
                  android:isolatedProcess="true"
                  android:exported="false" />
-        <service android:name="org.chromium.content.app.SandboxedProcessService7"
+        <service android:name="org.chromium.content_public.app.SandboxedProcessService7"
                  android:process=":sandboxed_process7"
                  android:permission="org.chromium.content_shell.permission.SANDBOX"
                  android:isolatedProcess="true"
                  android:exported="false" />
-        <service android:name="org.chromium.content.app.SandboxedProcessService8"
+        <service android:name="org.chromium.content_public.app.SandboxedProcessService8"
                  android:process=":sandboxed_process8"
                  android:permission="org.chromium.content_shell.permission.SANDBOX"
                  android:isolatedProcess="true"
                  android:exported="false" />
-        <service android:name="org.chromium.content.app.SandboxedProcessService9"
+        <service android:name="org.chromium.content_public.app.SandboxedProcessService9"
                  android:process=":sandboxed_process9"
                  android:permission="org.chromium.content_shell.permission.SANDBOX"
                  android:isolatedProcess="true"
                  android:exported="false" />
-        <service android:name="org.chromium.content.app.SandboxedProcessService10"
+        <service android:name="org.chromium.content_public.app.SandboxedProcessService10"
                  android:process=":sandboxed_process10"
                  android:permission="org.chromium.content_shell.permission.SANDBOX"
                  android:isolatedProcess="true"
                  android:exported="false" />
-        <service android:name="org.chromium.content.app.SandboxedProcessService11"
+        <service android:name="org.chromium.content_public.app.SandboxedProcessService11"
                  android:process=":sandboxed_process11"
                  android:permission="org.chromium.content_shell.permission.SANDBOX"
                  android:isolatedProcess="true"
                  android:exported="false" />
-        <service android:name="org.chromium.content.app.SandboxedProcessService12"
+        <service android:name="org.chromium.content_public.app.SandboxedProcessService12"
                  android:process=":sandboxed_process12"
                  android:permission="org.chromium.content_shell.permission.SANDBOX"
                  android:isolatedProcess="true"