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

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

Change-Id: Ic0690d40f94020099d876f6b96752130b3b7d787