[automerger skipped] [RESTRICT AUTOMERGE] Pass correct realCallingUid to...

[automerger skipped] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage skipped: bab818fd skipped: d3394051 skipped: 4278315b skipped: a2843201 skipped: 14b074dd am: b16bfc06 -s ours
am: a73dccba -s ours
am skip reason: change_id I0ef42c2f89b537a720f1ad5aefac756b0ccac52e with SHA1 216f65bf is in history

Change-Id: Iec15b46b0a2ac8c5af6e199021fdd4efb2c843c4