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

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

Change-Id: I00998f0109140d5fecf847f0e59f26805bf4a724