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

Merge "Merge "Merge "Fix the regression that closing transition disappeared." into rvc-dev am: 76cfda57 am: 13d62301" into rvc-d1-dev-plus-aosp am: 380189bd" into rvc-qpr-dev-plus-aosp am: f0e2cf77

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

Change-Id: Icc954af6225040bc75e0b54f4464361704a48483