Merge changes from topic "am-81895627a917473fa46c1238205a69ee"

* changes:
  [automerger skipped] Merge changes from topic "widget_launch_cookie-sc-v2-dev" into sc-v2-dev-plus-aosp am: 95554e89 -s ours am: ba319a8c -s ours
  [automerger skipped] [automerge] Allowing launch cookies to be passed via pending activity starts 2p: 30362a07 am: 37a7c8e8 -s ours am: 0de06736 -s ours