Merge "Fixed an issue where notifications wouldn't animate on height change"...

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

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

Change-Id: I7df286863f543cf647eb9e4e4305f89acc32edad