Merge "Sending RESULT_CANCELED to caller if the activity cannot be started"...

Merge "Sending RESULT_CANCELED to caller if the activity cannot be started" into tm-dev am: 6b11b0f8 am: 9d85608c

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



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