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: I9c08f0cdf8e83686e62bdc3d6dff6f618468a7dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>