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: 6e6c3e28 am: c0ef4aae

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



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