Merge "Fixing notification background peeking from the bottom when expanding QS" into sc-dev am: 4c4ab603 am: 9a2f87c4 am: 74d1e007

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

Change-Id: Ib7363b9f9724285e2b5e2b7bf7a5cd793bedacd3