Merge "Fix heads-up notification being sometimes clipped when pulsing" into...

Merge "Fix heads-up notification being sometimes clipped when pulsing" into tm-qpr-dev am: 71592cf7 am: 4e5320d2

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



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