Merge "Fix disappear animation" into rvc-dev am: af5f7620 am: 3d286f2e am: 0dd3f623 am: 2327f6a2

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

Change-Id: Idf2afbd2147b0fd6f65b060af04bbce431b8c438