[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 -s ours am: 31e23bec -s ours

am skip reason: subject contains skip directive

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



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