[automerger skipped] Merge "DO NOT MERGE Hide EmptyShadeView when on bouncer" into tm-qpr-dev am: 80b0850938 -s ours

am skip reason: subject contains skip directive

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

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