Merge "No longer embedding activity if started-for-result across TFs" into...

Merge "No longer embedding activity if started-for-result across TFs" into tm-qpr-dev am: eb92ed9c am: f8201a0b

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



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