[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 skip reason: subject contains skip directive

Change-Id: I7c869cb79734200a9bf797db5babac76e3d4971c