Merge "Merge "Strip transition information from activityoptions when sent to...

Merge "Merge "Strip transition information from activityoptions when sent to app" into sc-v2-dev am: eeab6009 am: 5a154b39 am: c728e9fa" into tm-d1-dev-plus-aosp am: 77ac0187

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



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