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

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



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