Merge "Reapply "Add libcgrouprc to multilib.both.deps"" into main am: 174ef64e90

Original change: https://android-review.googlesource.com/c/platform/build/+/3299008

Change-Id: I6e5f5eaff7d7c7e8636bbe734c5170c935a6d6a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>