Merge "Merge "Fix the regression that closing transition disappeared." into rvc-dev am: 76cfda57e5 am: 13d623015d" into rvc-d1-dev-plus-aosp am: 380189bdec

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

Change-Id: Iba1e7d1eec0afce9e4bea483231c65ff13c89d18