Merge "Handle embedding startActivity Intent when calling from application"...

Merge "Handle embedding startActivity Intent when calling from application" into tm-qpr-dev am: ff3fcfe7

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



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