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

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

Change-Id: I1a3578da6521da30f4ff32857d01c57715419e36