[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 am: 8bb5307a -s ours am: 589cab92 -s ours

am skip reason: skipped by user dupin

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

Change-Id: I5f148a6ec6b542dc59952e315e92ed92d6b9d2d5