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

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

Change-Id: I2925d1e869b590df606442ebbdf03bec64c043b7