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

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

Change-Id: I588fb3162b511166f5e1a3f2519724e8ce780a4d