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

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

Change-Id: I36f8bcc5bc6d8760feb334c43543f217f6f3321e