Merge changes from topic "am-ad570698c4e44b98b54eb5df207cae19" into qt-r1-dev-plus-aosp
* changes:
[automerger skipped] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage skipped: bab818fd4c skipped: d33940512a skipped: 4278315b95 skipped: a284320118 skipped: 14b074ddfe am: b16bfc06a0 -s ours am: a73dccba1f -s ours am: c640823563 -s ours am: a6970095ee -s ours am: 6d7f041b06 -s ours am: a9ee5d6047 -s ours am skip reason: change_id I0ef42c2f89b537a720f1ad5aefac756b0ccac52e with SHA1 216f65bf60 is in history
[automerger skipped] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() if provided by PendingIntentRecord#sendInner() am: 13a804ee27 -s ours am: 73683643a8 -s ours am: a7d55adc89 -s ours am: 9eff11ebb1 -s ours am: 6a8f83c0f1 -s ours am: a4f2100517 -s ours am skip reason: change_id I0ef42c2f89b537a720f1ad5aefac756b0ccac52e with SHA1 216f65bf60 is in history