Merge "Properly apply launch animation params" into tm-dev am: bfab1707 am:...

Merge "Properly apply launch animation params" into tm-dev am: bfab1707 am: d9355114 am: 0669161b

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



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