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

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

Change-Id: Ic108fd6ca47ef0a21ac2a8bd4393f36ee6ca7ced