Merge "Fix snooze guts disappearing in split shade" into sc-v2-dev am: eaaeb2f6

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

Change-Id: I566ac7c5ea4462df8bdbf3da1ffa2ed880d54cf9