[automerger skipped] Merge "[RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() if provided by PendingIntentRecord#sendInner()" into pi-dev am: 138f85570c -s ours am: ad8680bfcb
am: cc499ed88e
Change-Id: I28b00d95c8637da380d0775d7b9ecdbae27313dd
This commit is contained in: