Merge "run-as: Keep supplementary groups." am: e80beca255 am: ee4d611c46 am: 8740d88c66
am: 94be69982f

Change-Id: I90bd62685c96a8c25e92ca2674a5a73a3bd6d0ce