Merge "Reland: Add FrameworksNetTests dependency on libcgrouprc"