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

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

Change-Id: I5d4be4d88760cf1a12d52aace580348255fdf01e