Merge "Fix some minor issues with animating dismiss" into rvc-dev am:...

Merge "Fix some minor issues with animating dismiss" into rvc-dev am: a2caf278 am: 1340c40a am: 1be8b777

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

Change-Id: I4c9583a1387f753902c2c573a66ffab414b514a8