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 am: 5a154b39 am: 85817e65

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



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