Use the same taskAffinity for trampoline as Camera

Bug: 10842131
Change-Id: I2bf6961d7c411dc95e9b9589d9ec71ee34b3011f
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 69d16ca..a8ffe43 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -177,9 +177,9 @@
         <activity android:name="com.android.camera.CameraActivity"
             android:icon="@mipmap/ic_launcher_camera"
             android:label="@string/camera_label"
+            android:taskAffinity="com.android.camera.CameraActivity"
             android:theme="@style/android:Theme.NoDisplay" />
         <activity-alias android:name="com.android.camera.CameraLauncher"
-            android:excludeFromRecents="true"
             android:label="@string/camera_label"
             android:targetActivity="com.android.camera.CameraActivity">
             <intent-filter>