Merge "Merge "Sending RESULT_CANCELED to caller if the activity cannot be started" into tm-dev am: 6b11b0f8 am: 9d85608c" into tm-d1-dev-plus-aosp am: fed546ba am: 919daec3

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



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