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

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

Change-Id: Ib9641e4c45883f818bc6621ae11460c9ea6bd92a