[automerger skipped] [automerge] Allowing launch cookies to be passed via pending activity starts 2p: 30362a07 am: 37a7c8e8 -s ours am: 0de06736 -s ours

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

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

Change-Id: I55960350ae3e42bc02ec1c56c3ca08839c163c20