Merge "Fix disappear animation" into rvc-dev am: af5f762072 am: dbe31d3b79

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

Change-Id: I990b8c73e9010ba7aed7ad325a28bd6ed1cd808f