Merge "[automerger skipped] Merge "[RESTRICT AUTOMERGE] Pass correct...

Merge "[automerger skipped] Merge "[RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() if provided by PendingIntentRecord#sendInner()" into pi-dev am: 138f8557 -s ours am: ad8680bf am: d914b968" into qt-r1-dev-plus-aosp
am: 66f2e6ec -s ours
am skip reason: subject contains skip directive

Change-Id: Iefefde11b7efd94e08c9ad212bffc98d5bfe8376