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

Change-Id: I971873b279dae899ae45718aa569681407e9a31f