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

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



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