[automerger skipped] Merge "[RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() if provided by PendingIntentRecord#sendInner()" into pi-dev
am: 138f85570c -s ours
am skip reason: subject contains skip directive

Change-Id: I6a094762a2cedb2aeba013bbd2a52adedac65963