[automerger skipped] DO NOT MERGE Hide EmptyShadeView when on bouncer am: 2e640447d1 -s ours am: 3d23a669b1 -s ours am: e1d21ea6e5 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I90be361067995fa5be26a348aa38692135c19302
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>