[automerger skipped] Merge "DO NOT MERGE Hide EmptyShadeView when on bouncer" into tm-qpr-dev am: 80b08509 -s ours am: 31e23bec -s ours am: 67bec076 -s ours am: 08e120a5 -s ours

am skip reason: subject contains skip directive

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



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