Merge "[automerger skipped] Merge "Add FrameworksNetTests dependency on libcgrouprc" am: 3729b26f8a -s ours am: 204ef43f56 -s ours
am: 1704d678ff -s ours
am skip reason: change_id Ifcfe4df81caf8ede2e4e66a76552cb3200378fa8 with SHA1 061cec7755 is in history

Change-Id: If2094e6df4674d0c32f7d79b09b7f182d3284b3f