[automerger skipped] Merge "DO NOT MERGE [QPR1] Fix QS having a white when...

[automerger skipped] Merge "DO NOT MERGE [QPR1] Fix QS having a white when opened over bubbles" into sc-qpr1-dev am: 1daf01ab -s ours am: 59791c60 -s ours am: 59cc0b77 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ie5ef5b151b2d8a0706105f1da1cc2a2a52038852