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 am: 4c78e5c9 am: aa569948

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



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