Merge "Fix shade not having a background when opened on an expanded bubble"...

Merge "Fix shade not having a background when opened on an expanded bubble" into sc-dev am: a1306885 am: 35d063ba am: b608553d

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

Change-Id: I9f9fa69c0a2a88d9ec9edd654edf57cfd037d99e