Merge "Add flag-junit to FrameworksMockingServicesTests" into main