Merge "Fix hidden EmptyShadeView" into sc-dev am: 2458c8f8c6 am: 052e6636a5 am: c5d0606509

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

Change-Id: If8fe5ddff37bb08f9050cd1bc3c952c1d3b3cd46