Merge "Revert "Send RESULT_CANCELED immediately if start-activity-for-result...

Merge "Revert "Send RESULT_CANCELED immediately if start-activity-for-result across TaskFragments"" into tm-qpr-dev am: 6446b230 am: 35587744

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



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