Merge "Prevent system uid component from running in an isolated app process" into oc-dev am: 909ff7dc71
am: 68f3234072

Change-Id: I2393d4b5c683892d489398c906790c966a38b36b