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: 49c424d0" into udc-qpr-dev-plus-aosp am: 2d504033

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



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