Merge "Return error code when there's an error starting an activity" into main am: 8d40ab04

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



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