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

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



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