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: 7cb14424 am: 42f3370e am: f16482e6

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



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