Merge "Return error code when there's an error starting an activity" into main...

Merge "Return error code when there's an error starting an activity" into main am: 8d40ab04 am: 64632eed am: d741afd4 am: bef1d1a1 am: 207c8222

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



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