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