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

Merge "Send RESULT_CANCELED immediately if start-activity-for-result across TaskFragments" into tm-qpr-dev am: e2bf40bc am: fc28fab2

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



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