Merge "Fix some minor issues with animating dismiss" into rvc-dev am: a2caf278 am: f3699f1c am: c7e7c2fa

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

Change-Id: Ic5ee767010cfa604003674f88af2df83905b2070