Merge "run-as: Keep supplementary groups." into oc-mr1-dev
am: 93764d3c07

Change-Id: I717b3fcfc8f3ce82d2831431c7576eda946fca73