Merge "Fix dialog exit animation" into sc-v2-dev am: 2e314e86 am: 70c5b554...

Merge "Fix dialog exit animation" into sc-v2-dev am: 2e314e86 am: 70c5b554 am: 11b76884 am: 17730f2a

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

Change-Id: Ibedbc32c2fb5b277b73361e1e7c8c04ebf1631e9