Merge "Fixed an issue where notifications wouldn't animate on height change" into sc-dev am: cf3dbf7a4d

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

Change-Id: I5899abf746de92857b2e4b3183d15bf832ae1621