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 am: 4d0e100c am: 0f142b3e

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



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