Merge "Fix heads-up notification clipping in split shade" into tm-qpr-dev am:...

Merge "Fix heads-up notification clipping in split shade" into tm-qpr-dev am: d2cb2303 am: 04755c45

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



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