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 am: f87a3db9

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



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