Merge "DscpPolicyTest: annotate with ConnectivityModuleTest"