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

Merge "Override activity exit transition to none" into udc-dev am: 530f462f am: 2cc661c1 am: ac3cce48

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



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