Merge "Set launch cookie when starting activity from recents" into tm-qpr-dev...

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

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



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