Merge "Add setter/getter methods test for DscpPolicy.Builder"