Merge "Associate MAINLINE_NETWORK_STACK with net_raw and net_admin gid" am: ee6679031e

Change-Id: Idbc5cf8b89f9fac7a45b19b68270a640308079b0