Merge "Fix the regression that closing transition disappeared." into rvc-dev...

Merge "Fix the regression that closing transition disappeared." into rvc-dev am: 76cfda57 am: 13d62301 am: c50d389e

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

Change-Id: Ibe6610c59c2a26d86deb188f986abebca7374518