Merge "Reland: Add FrameworksNetTests dependency on libcgrouprc"
am: 909e72a9e4

Change-Id: I613b777085257fcaebfd88bcb761024d3cea1633