[automerger skipped] Merge "Correctly clip QS during heads-up pull down" into...

[automerger skipped] Merge "Correctly clip QS during heads-up pull down" into sc-qpr1-dev am: 33be4a76 -s ours am: 84b4f01f -s ours

am skip reason: skipped by user dupin

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

Change-Id: Ib900faaa8c211dbd23e05529b0af0448a0346277