Merge "Fix overlapping alpha of shade pull down" into sc-v2-dev am: b223ed58 am: 244802fb

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

Change-Id: I402e8613307231b1a51032b24dac65e2bc18f08f