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

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

Change-Id: I6ca882af08b487f5d261763c34291dfc66460760