Merge "Fix dialog exit animation" into sc-v2-dev am: 2e314e8639 am: 70c5b5546c

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

Change-Id: I6b1ae2cac43f0b26d80c138ef563c8b11c3d20cb