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

Change-Id: Ia41cb5bff91294085516f9d400519031c22925c3