[automerger skipped] Merge "Allowing launch cookies to be passed via pending...

[automerger skipped] Merge "Allowing launch cookies to be passed via pending activity starts" into sc-v2-dev am: 42b2cec2 -s ours am: d58b4422 -s ours am: 3b484d91 -s ours

am skip reason: Merged-In I339ea827836fa53ab5bb1617a72f9e0e5ae0f5ec with SHA-1 30362a07 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16968731

Change-Id: Icfc14b51271760989a68cfdbde2fba3ad3f2aa90