[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: 0b34d1ac -s ours am: 0a3be146 -s ours

am skip reason: subject contains skip directive

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



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