Merge "Properly apply launch animation params" into tm-dev am: bfab17072d am: d935511424

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

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