Merge "DO NOT MERGE [QPR1] Fix QS having a white when opened over bubbles" into sc-qpr1-dev am: 1daf01ab

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

Change-Id: I42f016f05a3b6de90f4f46591edde2a930d777bd