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: 2bc7bc06

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



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