[automerger skipped] Merge "Make QS pull down consistent with shade" into...

[automerger skipped] Merge "Make QS pull down consistent with shade" into sc-qpr1-dev am: 8daf4242 am: 3864ff6c -s ours am: 5e1565fb -s ours

am skip reason: Merged-In I44387c6295d10633ebffa02b0e45c0144dd8ddfe with SHA-1 fb1862ba is already in history

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

Change-Id: I66de75e1a25dec34e825eb0634cf44067f6e712a