Merge "Merge "Drop supplementary groups for child zygotes." into rvc-dev am: 1a081317 am: 81a1af64" into rvc-d1-dev-plus-aosp