[automerger skipped] Merge "Reland: Add FrameworksNetTests dependency on libcgrouprc" am: 909e72a9e4 am: e8ceef0220 -s ours
am: 9a2a3f71b9 -s ours
am skip reason: change_id If9c8aa41c4e96a79b71c88f199a4f3b0483e31cd with SHA1 b01cd7f4ee is in history

Change-Id: I9eff349b9d879aa84d8bb096ec895a749e138ca8