[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: 9eff11ebb1 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic37556cb1dbdb7dfbd58109ca9e96eb14a5e718c