Merge "First part of Fixing heads-up notification motion in split shade" into...

Merge "First part of Fixing heads-up notification motion in split shade" into tm-qpr-dev am: 12520fff am: 74d88a0b

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



Change-Id: I96e37e8d00a427b2015e207a1b7bb68a0201fb0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>