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

Change-Id: I5210f8aed11e5b43bc09ce61f91ea399faa3dc4a