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

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

Change-Id: I4adb89b89bba2fe0d5d238b87849b9f0205b2bdd