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

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

Change-Id: I60c7a3730171ce214f04fca05a870708c9f77c2f