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

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

Change-Id: I7e6f0c79e0247581845e0683c00c6ded3040931c