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

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

Change-Id: I984d32448382e742c18ea2b231a42525fe68e375