Merge "Fix an issue where sometimes we wouldn't animate while dismissing" into...

Merge "Fix an issue where sometimes we wouldn't animate while dismissing" into udc-dev am: 77ea2805 am: 809058ce

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



Change-Id: I3f0c193d4d77f8b43261b92203bb291cf3000513
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>