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

Merge "Merge "Revert "Strip transition information from activityoptions once it is read."" into sc-v2-dev am: 1099b25b am: d7ae0338 am: 2e763d31" into tm-d1-dev-plus-aosp am: 045b0a8d am: 68fcf465

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



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