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

Merge "Strip transition information from activityoptions once it is read." into sc-v2-dev am: dc8ae766 am: a824844c am: b681ae52 am: ad04f403 am: 617507a3

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



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