Merge "Only use return transition when requested." into tm-qpr-dev am: efff8e9f am: b1b41f18

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



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