[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 -s ours am: 69feb3dc -s ours am: 4c646de4 -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: I804508585c1e239db84246910804f3f36b9fbfe8