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

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

Change-Id: I471c66b754cbabf6f3fec9426f6bcfef6806057f