[automerger skipped] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage skipped: bab818fd4c skipped: d33940512a

Change-Id: I8cd17220b0f8f8a8fa88c97d82272f3c2b06fd85