Merge "Merge BroadcastOptions and ActivityOptions PendingIntent BAL flags and remove @hide."