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

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

Change-Id: I325048b3a2d582264a2a533a310c282ecc41501b