Merge "Kill the real/isolated uid group, not the ApplicationInfo uid" into nyc-dev