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

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



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