[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 am: 0037242945
am: 64838ba31d -s ours
am skip reason: subject contains skip directive

Change-Id: Iaf2072a967b807d01847590c4ab7094834b3a669