Merge "Adds new activity flags to the @Flags annotation." into rvc-dev am: 24070a6c95

Change-Id: I46b97ec58ff4d8f4cdb997ffa47cc3d5694909bb

core/java/android/content/Intent.java

@@ -6015,6 +6015,8 @@ public class Intent implements Parcelable, Cloneable {
             FLAG_ACTIVITY_TASK_ON_HOME,
             FLAG_ACTIVITY_RETAIN_IN_RECENTS,
             FLAG_ACTIVITY_LAUNCH_ADJACENT,
+            FLAG_ACTIVITY_REQUIRE_NON_BROWSER,
+            FLAG_ACTIVITY_REQUIRE_DEFAULT,
             FLAG_RECEIVER_REGISTERED_ONLY,
             FLAG_RECEIVER_REPLACE_PENDING,
             FLAG_RECEIVER_FOREGROUND,