Merge "Merge "Fix the regression that closing transition disappeared." into...

Merge "Merge "Fix the regression that closing transition disappeared." into rvc-dev am: 76cfda57 am: 7a219bba am: dfd10112" into rvc-qpr-dev-plus-aosp am: 8f82cc6c

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

Change-Id: Ife3fa0a811dc1ab99e09dad7dcd025e233095e8a