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

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



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