Merge "Fix realCallingUid/Pid for startActivities()" into nyc-mr1-dev