[automerger skipped] Merge "Reland: Add FrameworksNetTests dependency on libcgrouprc" am: 85548fdf -s ours
am: 8c4a6891 -s ours
am skip reason: change_id I85891485157ed86e069039dfe3092028ff703dd5 with SHA1 94dc6d68 is in history
Change-Id: If9c8aa41c4e96a79b71c88f199a4f3b0483e31cd