Merge "Fix hidden EmptyShadeView" into sc-dev am: 2458c8f8c6 am: 15f319906e am: 804cabbef8

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

Change-Id: I57c4515fb5e30cd9da4a3cb107f4c99c7dc14357