Merge "Merge "Consider shade expansion when blurring because QS" into sc-dev am: 65c43136 am: 5c05429e am: ca2a0897" into sc-v2-dev-plus-aosp am: 59add4f6

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

Change-Id: I4b51b657a5737edb1961cd77fa3ab70d057e9300