[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: 6a8f83c0f1 -s ours
am: 09579bcc19 -s ours
am skip reason: change_id I0ef42c2f89b537a720f1ad5aefac756b0ccac52e with SHA1 216f65bf60 is in history

Change-Id: I387fea3f57915d26c2705d6c2bbb2b0cba30d4cf