Merge "run-as: Keep supplementary groups." am: e80beca255
am: ee4d611c46

Change-Id: Ib493bc3ef35125c9302002d62c620fabe7a8c9da