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

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

Change-Id: I7da28f902a1bcebff6c5426511bb2e16fb80151b