[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: 2ae00c63 -s ours am: 0c1eb494 -s ours am: 37a0f8be -s ours

am skip reason: subject contains skip directive

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



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