Merge "Allow organizer to handle transition for non-embedded activity" into...

Merge "Allow organizer to handle transition for non-embedded activity" into sc-v2-dev am: fe71e802

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

Change-Id: Ief6e9a51f7d5d9671e6f1c0ca25a369aa674ed5b