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

Merge "Strip transition information from activityoptions when sent to app" into sc-v2-dev am: eeab6009

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



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