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

Change-Id: I8b67d639193d3546a63fc3b526353de5cafb4fb3