Merge "Consider shade expansion when blurring because QS" into sc-dev am: 65c4313694 am: 5c05429e6e

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

Change-Id: I100f3542652235656b00728d0dfc1029f23f771b