Merge "Fixing notification background peeking from the bottom when expanding QS" into sc-dev am: 4c4ab603d7

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

Change-Id: I6d661514d362add46e66b36138184b63238f6797