Merge "Don't do in-window animations if launching an activity." into tm-dev...

Merge "Don't do in-window animations if launching an activity." into tm-dev am: fc8db721 am: 5e405e4b am: d2bc283a am: b921dc55

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



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