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: bab818fd skipped: d3394051 skipped: 4278315b skipped: a2843201 skipped: 14b074dd am: b16bfc06 -s ours am: a73dccba -s ours am: c6408235 -s ours am: a6970095 -s ours am: 6d7f041b -s ours am: a9ee5d60 -s ours am skip reason: change_id I0ef42c2f89b537a720f1ad5aefac756b0ccac52e with SHA1 216f65bf is in history
  [automerger skipped] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() if provided by PendingIntentRecord#sendInner() am: 13a804ee -s ours am: 73683643 -s ours am: a7d55adc -s ours am: 9eff11eb -s ours am: 6a8f83c0 -s ours am: a4f21005 -s ours am skip reason: change_id I0ef42c2f89b537a720f1ad5aefac756b0ccac52e with SHA1 216f65bf is in history