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

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

Change-Id: If4fcf71e965454b770abfa83ef522e7b169e0f84