[automerger skipped] Merge "[RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() if provided by PendingIntentRecord#sendInner()" into pi-dev am: 138f85570c -s ours
am: ad8680bfcb

Change-Id: I4d3529c5df07d5f9eb84785bfa3c27ea0152a923