Replace PendingIntent.FLAG_UPDATE_CURRENT with PendingIntent.FLAG_CANCEL_CURRENT in InstrumentationActivityInvoker.

With FLAG_CANCEL_CURRENT, if a PendingIntent already exists with the same intent data, the previous PendingIntent is cancelled, thus removing any previous extras from the Intent.

FLAG_CANCEL_CURRENT solves the issue where the system caches the extras from the previous intent for the PendingIntent and thus the extras passed to the PendingIntent for the new Intent would be ignored. In theory, this would cause a very strange bug where the new intent would start the activity but with the previous extras.

PiperOrigin-RevId: 789036449

Author: copybara-androidxtest

core/CHANGELOG.md

@@ -6,6 +6,8 @@
 
 **Bug Fixes**
 
+* Fixes the issue where the system caches the extras from the previous intent for the PendingIntent and thus the extras passed to the PendingIntent for the new Intent would be ignored.
+
 **New Features**
 
 **Breaking Changes**

core/java/androidx/test/core/app/InstrumentationActivityInvoker.java

@@ -464,7 +464,7 @@ public void startActivityForResult(Intent intent, @Nullable Bundle activityOptio
                     getApplicationContext(),
                     /* requestCode= */ 0,
                     intent,
-                    /* flags= */ PendingIntent.FLAG_UPDATE_CURRENT | intentMutability))
+                    /* flags= */ PendingIntent.FLAG_CANCEL_CURRENT | intentMutability))
             .putExtra(TARGET_ACTIVITY_OPTIONS_BUNDLE_KEY, activityOptionsBundle);
 
     getApplicationContext().startActivity(bootstrapIntent, activityOptionsBundle);