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 am: 50a11c25

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



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