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

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

Change-Id: Ib3a473afa5c158bbed3b49d24a233a26592ef364