[automerger skipped] Merge "DO NOT MERGE Hide EmptyShadeView when on bouncer"...

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

am skip reason: subject contains skip directive

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



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