Merge "Merge "Override activity exit transition to none" into udc-dev am:...

Merge "Merge "Override activity exit transition to none" into udc-dev am: 530f462f am: 6e6c3e28 am: c0ef4aae" into udc-qpr-dev-plus-aosp am: 0928af8f

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



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