Merge "Drop supplementary groups for child zygotes. am: 5a452627 am: 694a2b95 am: abe8b3d9 am: 2f003e1b" into rvc-qpr-dev-plus-aosp