Merge "Fixed an issue where notification dismissals wouldn't animate" into sc-dev am: 0b6748480b am: 4e694a6ac5

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

Change-Id: I5040e86a8b1edb1fa134be20f3671741cd429e50