Merge "Set quick_qs_offset_height to 48dp in waterfall" into sc-dev am: 8a39e97d am: 521bc6ea

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

Change-Id: I82cbf70eedfd66e470c61dd78a7dbe69e599c30d