[automerger skipped] DO NOT MERGE Hide EmptyShadeView when on bouncer am:...

[automerger skipped] DO NOT MERGE Hide EmptyShadeView when on bouncer am: 2e640447 -s ours am: 3d23a669 -s ours am: 192daceb -s ours

am skip reason: subject contains skip directive

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



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