[automerger skipped] Merge "Allowing launch cookies to be passed via pending activity starts" into sc-v2-dev am: 42b2cec2d1 -s ours am: d58b4422a5 -s ours
am skip reason: Merged-In I339ea827836fa53ab5bb1617a72f9e0e5ae0f5ec with SHA-1 30362a07af is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16968731
Change-Id: Ia3fe6708696786dba449e22680ec9152a8a6ef2f
This commit is contained in: