Merge "Drop supplementary groups for child zygotes. am: 5a452627 am: 694a2b95 am: a36abd2f" into rvc-d1-dev-plus-aosp