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

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

Change-Id: I75cd8dc60afdadc1cdccd3bbe79788db437ff770