Merge "Add VTS test for add/remove QoS policy with traffic characteristics." into main