Revert "Merging  ub-launcher3-master, build 5938524"

This reverts commit 7cb721fa819992391045e70e5c109d8d43099a78.

Reason for revert: <INSERT REASONING HERE>

Change-Id: I10ebd177cc98be896282147df481b05f28241758
diff --git a/tests/AndroidManifest-common.xml b/tests/AndroidManifest-common.xml
index 56eca6d..c6f55a7 100644
--- a/tests/AndroidManifest-common.xml
+++ b/tests/AndroidManifest-common.xml
@@ -62,12 +62,6 @@
                 <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.launcher3.testcomponent.CustomShortcutConfigActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.CREATE_SHORTCUT" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
         <activity
             android:name="com.android.launcher3.testcomponent.RequestPinItemActivity"
             android:icon="@drawable/test_drawable_pin_item"
@@ -79,12 +73,8 @@
             </intent-filter>
         </activity>
 
-        <service
-            android:name="com.android.launcher3.testcomponent.ListViewService"
-            android:permission="android.permission.BIND_REMOTEVIEWS" />
-
         <provider
-            android:name="com.android.launcher3.testcomponent.TestCommandProvider"
+            android:name="com.android.launcher3.testcomponent.TestCommandReceiver"
             android:authorities="${packageName}.commands"
             android:exported="true"/>