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: fc301ed4 am: 0bd65b82

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



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