Merge "Revert "Strip transition information from activityoptions once it is...

Merge "Revert "Strip transition information from activityoptions once it is read."" into sc-v2-dev am: 1099b25b am: d7ae0338 am: 2e763d31

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



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