[automerger skipped] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() if provided by PendingIntentRecord#sendInner() am: 13a804ee27 -s ours am: 73683643a8 -s ours
am: a7d55adc89 -s ours
am skip reason: subject contains skip directive

Change-Id: I8fc565a08e9c3ed5709550bd347cca122c0d91e8