Merge "Set launch cookie when starting activity from recents" into tm-qpr-dev am: af699641

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



Change-Id: Ia2bab7998b290f4d01c9d2197f33f02765a6545f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>