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

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

Change-Id: Ic3c6fd1ffdd6d8e242fdd25ac8359cd3d310e892