Merge "Fix some notifications animation issues" into rvc-qpr-dev am: 2d4e0b75e2 am: 196e080ede

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

Change-Id: I0d34773e2bd09592a8ed1510aa72e666f6ec342f