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

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

Change-Id: Ie79f97a36812ee22f93562ce4a060d5db0a376ae